From 201571e49fc0612a0d253667bf0bbdd896566ed9 Mon Sep 17 00:00:00 2001
From: sethherr <seth.william.herr@gmail.com>
Date: Mon, 10 Jul 2017 15:38:59 -0700
Subject: [PATCH 1/4] dry out requires in fewwer places

---
 bin/papertrail                      | 1 +
 lib/papertrail.rb                   | 5 ++++-
 lib/papertrail/cli.rb               | 6 ------
 lib/papertrail/cli_add_group.rb     | 6 ------
 lib/papertrail/cli_add_system.rb    | 6 ------
 lib/papertrail/cli_helpers.rb       | 2 ++
 lib/papertrail/cli_join_group.rb    | 6 ------
 lib/papertrail/cli_leave_group.rb   | 6 ------
 lib/papertrail/cli_remove_system.rb | 6 ------
 lib/papertrail/version.rb           | 4 ++++
 10 files changed, 11 insertions(+), 37 deletions(-)
 create mode 100644 lib/papertrail/version.rb

diff --git a/bin/papertrail b/bin/papertrail
index 1f2906d..d6f7081 100755
--- a/bin/papertrail
+++ b/bin/papertrail
@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+require 'papertrail'
 require 'papertrail/cli'
 
 begin
diff --git a/lib/papertrail.rb b/lib/papertrail.rb
index a7d50bd..263558e 100644
--- a/lib/papertrail.rb
+++ b/lib/papertrail.rb
@@ -1,5 +1,8 @@
+require 'papertrail/version'
+require 'optparse'
+
 module Papertrail
-  VERSION = '0.10.3'
 end
 
 require 'papertrail/connection'
+require 'papertrail/cli_helpers'
\ No newline at end of file
diff --git a/lib/papertrail/cli.rb b/lib/papertrail/cli.rb
index 122263a..ce75f99 100644
--- a/lib/papertrail/cli.rb
+++ b/lib/papertrail/cli.rb
@@ -1,12 +1,6 @@
-require 'optparse'
-require 'yaml'
 require 'chronic'
 require 'ansi/core'
 
-require 'papertrail'
-require 'papertrail/connection'
-require 'papertrail/cli_helpers'
-
 module Papertrail
   class Cli
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_add_group.rb b/lib/papertrail/cli_add_group.rb
index 2db8ad9..17f68b6 100644
--- a/lib/papertrail/cli_add_group.rb
+++ b/lib/papertrail/cli_add_group.rb
@@ -1,9 +1,3 @@
-require 'optparse'
-require 'yaml'
-
-require 'papertrail/cli_helpers'
-require 'papertrail/connection'
-
 module Papertrail
   class CliAddGroup
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_add_system.rb b/lib/papertrail/cli_add_system.rb
index ae0a9f9..6b5b1a4 100644
--- a/lib/papertrail/cli_add_system.rb
+++ b/lib/papertrail/cli_add_system.rb
@@ -1,9 +1,3 @@
-require 'optparse'
-require 'yaml'
-
-require 'papertrail/cli_helpers'
-require 'papertrail/connection'
-
 module Papertrail
   class CliAddSystem
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_helpers.rb b/lib/papertrail/cli_helpers.rb
index b346e43..488baf5 100644
--- a/lib/papertrail/cli_helpers.rb
+++ b/lib/papertrail/cli_helpers.rb
@@ -1,3 +1,5 @@
+require 'yaml'
+
 module Papertrail
   module CliHelpers
     def find_configfile
diff --git a/lib/papertrail/cli_join_group.rb b/lib/papertrail/cli_join_group.rb
index a413f2a..74cdaa0 100644
--- a/lib/papertrail/cli_join_group.rb
+++ b/lib/papertrail/cli_join_group.rb
@@ -1,9 +1,3 @@
-require 'optparse'
-require 'yaml'
-
-require 'papertrail/cli_helpers'
-require 'papertrail/connection'
-
 module Papertrail
   class CliJoinGroup
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_leave_group.rb b/lib/papertrail/cli_leave_group.rb
index f78ae9b..2e12ee7 100644
--- a/lib/papertrail/cli_leave_group.rb
+++ b/lib/papertrail/cli_leave_group.rb
@@ -1,9 +1,3 @@
-require 'optparse'
-require 'yaml'
-
-require 'papertrail/cli_helpers'
-require 'papertrail/connection'
-
 module Papertrail
   class CliLeaveGroup
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_remove_system.rb b/lib/papertrail/cli_remove_system.rb
index e251409..7c7a190 100644
--- a/lib/papertrail/cli_remove_system.rb
+++ b/lib/papertrail/cli_remove_system.rb
@@ -1,9 +1,3 @@
-require 'optparse'
-require 'yaml'
-
-require 'papertrail/cli_helpers'
-require 'papertrail/connection'
-
 module Papertrail
   class CliRemoveSystem
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/version.rb b/lib/papertrail/version.rb
new file mode 100644
index 0000000..70b85ea
--- /dev/null
+++ b/lib/papertrail/version.rb
@@ -0,0 +1,4 @@
+# frozen_string_literal: true
+module Papertrail
+  VERSION = '0.10.3'
+end
\ No newline at end of file

From e8c52e86241f055830e33419e9165340b1182a8e Mon Sep 17 00:00:00 2001
From: sethherr <seth.william.herr@gmail.com>
Date: Mon, 10 Jul 2017 15:50:47 -0700
Subject: [PATCH 2/4] fix rakefile

---
 Rakefile           | 20 ++++++++------------
 papertrail.gemspec |  1 +
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Rakefile b/Rakefile
index 7e55c01..4945970 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rake'
 require 'date'
+require File.expand_path('../lib/papertrail/version', __FILE__)
 
 #############################################################################
 #
@@ -16,11 +17,6 @@ def module_name
   name.split('-').first
 end
 
-def version
-  line = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*.*/]
-  line.match(/.*VERSION\s*=\s*['"](.*)['"]/)[1]
-end
-
 def date
   Date.today.to_s
 end
@@ -34,7 +30,7 @@ def gemspec_file
 end
 
 def gem_file
-  "#{name}-#{version}.gem"
+  "#{name}-#{Papertrail::VERSION}.gem"
 end
 
 def replace_header(head, header_name)
@@ -75,17 +71,17 @@ end
 #
 #############################################################################
 
-desc "Create tag v#{version} and build and push #{gem_file} to Rubygems"
+desc "Create tag v#{Papertrail::VERSION} and build and push #{gem_file} to Rubygems"
 task :release => :build do
   unless `git branch` =~ /^\* master$/
     puts "You must be on the master branch to release!"
     exit!
   end
-  sh "git commit --allow-empty -a -m 'Release #{version}'"
-  sh "git tag v#{version}"
+  sh "git commit --allow-empty -a -m 'Release #{Papertrail::VERSION}'"
+  sh "git tag v#{Papertrail::VERSION}"
   sh "git push origin master"
-  sh "git push origin v#{version}"
-  sh "gem push pkg/#{name}-#{version}.gem"
+  sh "git push origin v#{Papertrail::VERSION}"
+  sh "gem push pkg/#{name}-#{Papertrail::VERSION}.gem"
 end
 
 desc "Build #{gem_file} into the pkg directory"
@@ -103,7 +99,7 @@ task :gemspec => :validate do
 
   # replace name version and date
   replace_header(head, :name)
-  replace_header(head, :version)
+  replace_header(head, Papertrail::VERSION)
   replace_header(head, :date)
   #comment this out if your rubyforge_project has a different name
   replace_header(head, :rubyforge_project)
diff --git a/papertrail.gemspec b/papertrail.gemspec
index 588ddff..0e8b060 100644
--- a/papertrail.gemspec
+++ b/papertrail.gemspec
@@ -95,6 +95,7 @@ Gem::Specification.new do |s|
     lib/papertrail/okjson.rb
     lib/papertrail/search_query.rb
     lib/papertrail/search_result.rb
+    lib/papertrail/version.rb
     papertrail.gemspec
     test/connection_test.rb
     test/http_client_test.rb

From 43d05941f3d75fa0be9822bbcf95474c16d67896 Mon Sep 17 00:00:00 2001
From: sethherr <seth.william.herr@gmail.com>
Date: Tue, 11 Jul 2017 14:16:31 -0700
Subject: [PATCH 3/4] Require libraries where they are used

---
 lib/papertrail.rb                   | 1 -
 lib/papertrail/cli.rb               | 1 +
 lib/papertrail/cli_add_group.rb     | 2 ++
 lib/papertrail/cli_add_system.rb    | 2 ++
 lib/papertrail/cli_join_group.rb    | 2 ++
 lib/papertrail/cli_leave_group.rb   | 2 ++
 lib/papertrail/cli_remove_system.rb | 2 ++
 7 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/lib/papertrail.rb b/lib/papertrail.rb
index 263558e..768d974 100644
--- a/lib/papertrail.rb
+++ b/lib/papertrail.rb
@@ -1,5 +1,4 @@
 require 'papertrail/version'
-require 'optparse'
 
 module Papertrail
 end
diff --git a/lib/papertrail/cli.rb b/lib/papertrail/cli.rb
index ce75f99..ae52e1e 100644
--- a/lib/papertrail/cli.rb
+++ b/lib/papertrail/cli.rb
@@ -1,3 +1,4 @@
+require 'optparse'
 require 'chronic'
 require 'ansi/core'
 
diff --git a/lib/papertrail/cli_add_group.rb b/lib/papertrail/cli_add_group.rb
index 17f68b6..6727a30 100644
--- a/lib/papertrail/cli_add_group.rb
+++ b/lib/papertrail/cli_add_group.rb
@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Papertrail
   class CliAddGroup
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_add_system.rb b/lib/papertrail/cli_add_system.rb
index 6b5b1a4..07eff16 100644
--- a/lib/papertrail/cli_add_system.rb
+++ b/lib/papertrail/cli_add_system.rb
@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Papertrail
   class CliAddSystem
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_join_group.rb b/lib/papertrail/cli_join_group.rb
index 74cdaa0..a1f74d4 100644
--- a/lib/papertrail/cli_join_group.rb
+++ b/lib/papertrail/cli_join_group.rb
@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Papertrail
   class CliJoinGroup
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_leave_group.rb b/lib/papertrail/cli_leave_group.rb
index 2e12ee7..44e57f7 100644
--- a/lib/papertrail/cli_leave_group.rb
+++ b/lib/papertrail/cli_leave_group.rb
@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Papertrail
   class CliLeaveGroup
     include Papertrail::CliHelpers
diff --git a/lib/papertrail/cli_remove_system.rb b/lib/papertrail/cli_remove_system.rb
index 7c7a190..025e124 100644
--- a/lib/papertrail/cli_remove_system.rb
+++ b/lib/papertrail/cli_remove_system.rb
@@ -1,3 +1,5 @@
+require 'optparse'
+
 module Papertrail
   class CliRemoveSystem
     include Papertrail::CliHelpers

From 28a34761b0efd07600cf55b7dd6d30615517b1b8 Mon Sep 17 00:00:00 2001
From: sethherr <seth.william.herr@gmail.com>
Date: Tue, 11 Jul 2017 14:26:31 -0700
Subject: [PATCH 4/4] different require setup

---
 bin/papertrail                      | 1 -
 bin/papertrail-add-group            | 1 -
 bin/papertrail-add-system           | 1 -
 bin/papertrail-join-group           | 1 -
 bin/papertrail-leave-group          | 1 -
 bin/papertrail-remove-system        | 1 -
 lib/papertrail.rb                   | 1 +
 lib/papertrail/cli.rb               | 2 +-
 lib/papertrail/cli_add_group.rb     | 2 +-
 lib/papertrail/cli_add_system.rb    | 2 +-
 lib/papertrail/cli_join_group.rb    | 2 +-
 lib/papertrail/cli_leave_group.rb   | 2 +-
 lib/papertrail/cli_remove_system.rb | 2 +-
 13 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/bin/papertrail b/bin/papertrail
index d6f7081..1f2906d 100755
--- a/bin/papertrail
+++ b/bin/papertrail
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'papertrail'
 require 'papertrail/cli'
 
 begin
diff --git a/bin/papertrail-add-group b/bin/papertrail-add-group
index 431ef5b..032384d 100755
--- a/bin/papertrail-add-group
+++ b/bin/papertrail-add-group
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'papertrail'
 require 'papertrail/cli_add_group'
 
 begin
diff --git a/bin/papertrail-add-system b/bin/papertrail-add-system
index a406cdd..20fe67b 100755
--- a/bin/papertrail-add-system
+++ b/bin/papertrail-add-system
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'papertrail'
 require 'papertrail/cli_add_system'
 
 begin
diff --git a/bin/papertrail-join-group b/bin/papertrail-join-group
index 75023ab..ef68322 100755
--- a/bin/papertrail-join-group
+++ b/bin/papertrail-join-group
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'papertrail'
 require 'papertrail/cli_join_group'
 
 begin
diff --git a/bin/papertrail-leave-group b/bin/papertrail-leave-group
index dc5b17f..3119c0a 100755
--- a/bin/papertrail-leave-group
+++ b/bin/papertrail-leave-group
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'papertrail'
 require 'papertrail/cli_leave_group'
 
 begin
diff --git a/bin/papertrail-remove-system b/bin/papertrail-remove-system
index 8712862..fdd4609 100755
--- a/bin/papertrail-remove-system
+++ b/bin/papertrail-remove-system
@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-require 'papertrail'
 require 'papertrail/cli_remove_system'
 
 begin
diff --git a/lib/papertrail.rb b/lib/papertrail.rb
index 768d974..263558e 100644
--- a/lib/papertrail.rb
+++ b/lib/papertrail.rb
@@ -1,4 +1,5 @@
 require 'papertrail/version'
+require 'optparse'
 
 module Papertrail
 end
diff --git a/lib/papertrail/cli.rb b/lib/papertrail/cli.rb
index ae52e1e..8529386 100644
--- a/lib/papertrail/cli.rb
+++ b/lib/papertrail/cli.rb
@@ -1,6 +1,6 @@
-require 'optparse'
 require 'chronic'
 require 'ansi/core'
+require 'papertrail'
 
 module Papertrail
   class Cli
diff --git a/lib/papertrail/cli_add_group.rb b/lib/papertrail/cli_add_group.rb
index 6727a30..14cbb0f 100644
--- a/lib/papertrail/cli_add_group.rb
+++ b/lib/papertrail/cli_add_group.rb
@@ -1,4 +1,4 @@
-require 'optparse'
+require 'papertrail'
 
 module Papertrail
   class CliAddGroup
diff --git a/lib/papertrail/cli_add_system.rb b/lib/papertrail/cli_add_system.rb
index 07eff16..bb16ae7 100644
--- a/lib/papertrail/cli_add_system.rb
+++ b/lib/papertrail/cli_add_system.rb
@@ -1,4 +1,4 @@
-require 'optparse'
+require 'papertrail'
 
 module Papertrail
   class CliAddSystem
diff --git a/lib/papertrail/cli_join_group.rb b/lib/papertrail/cli_join_group.rb
index a1f74d4..e0763cc 100644
--- a/lib/papertrail/cli_join_group.rb
+++ b/lib/papertrail/cli_join_group.rb
@@ -1,4 +1,4 @@
-require 'optparse'
+require 'papertrail'
 
 module Papertrail
   class CliJoinGroup
diff --git a/lib/papertrail/cli_leave_group.rb b/lib/papertrail/cli_leave_group.rb
index 44e57f7..1f39db1 100644
--- a/lib/papertrail/cli_leave_group.rb
+++ b/lib/papertrail/cli_leave_group.rb
@@ -1,4 +1,4 @@
-require 'optparse'
+require 'papertrail'
 
 module Papertrail
   class CliLeaveGroup
diff --git a/lib/papertrail/cli_remove_system.rb b/lib/papertrail/cli_remove_system.rb
index 025e124..33130ac 100644
--- a/lib/papertrail/cli_remove_system.rb
+++ b/lib/papertrail/cli_remove_system.rb
@@ -1,4 +1,4 @@
-require 'optparse'
+require 'papertrail'
 
 module Papertrail
   class CliRemoveSystem