dumper 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738929ed8f9f1892d7aba60b3522e82b1d980c4b
-  data.tar.gz: 96d32207c0c292ff11d40fc6d5ba1184753b4996
+  metadata.gz: b601179630f672e78d097cc6b7bbe2a154a5b71e
+  data.tar.gz: 41058b3e711dc4ca68fade869be505c76d173358
 SHA512:
-  metadata.gz: 05136b455cf44fef7dfa0937b0fdd1269141797eea397e4994723736e7f07c5861d3d93f19cd58eabd6eb798ce312fd84dc31dd070c77e2c5d5484d87db1bbc6
-  data.tar.gz: 1d8cec2a5661f84c1d694e88222f9196575bd9278398a11d194c856deb038ba1cfd527e1b5b29119c849ddc8625ede6d3d1bbf5a7db61130b13f22324ae99eea
+  metadata.gz: 2ffc004b93fd9f0a936c9465edc864dfa266d4d02cb3302f1c0f07e2a162a63bde0ca98524adf0634963bfc9090b31c2e6ab4232574a30e0f39fed79343d9e45
+  data.tar.gz: b55a25b90634606ca9c19a214b42f8ae2d9ce990f0fdd4ccc669e9ccea81f58734234b8e00430e6d00409b75d6de7305d0d8cec213df2057e324a74f23a0cf29

data/lib/dumper.rb

@@ -6,7 +6,6 @@ module Dumper
   autoload :Dependency, 'dumper/dependency'
   autoload :Job,        'dumper/job'
   autoload :Stack,      'dumper/stack'
-  autoload :Utility,    'dumper/utility'
   autoload :VERSION,    'dumper/version'
 
   module Database
@@ -16,4 +15,10 @@ module Dumper
     autoload :MongoDB,    'dumper/database/mongodb'
     autoload :Redis,      'dumper/database/redis'
   end
+
+  module Utility
+    autoload :IP,           'dumper/utility/ip'
+    autoload :Log,          'dumper/utility/log'
+    autoload :ObjectFinder, 'dumper/utility/object_finder'
+  end
 end

data/lib/dumper/agent.rb

@@ -4,7 +4,7 @@ require 'dumper/patch'
 
 module Dumper
   class Agent
-    include Dumper::Utility::LoggingMethods
+    include Dumper::Utility::Log
 
     API_VERSION = 1
     MAX_FILESIZE = 2147483648 # 2.gigabytes

data/lib/dumper/cli.rb

@@ -16,12 +16,12 @@ module Dumper
     no_tasks do
       def check_ip
         print 'Checking IP address... '
-        @ip = Dumper::Utility::IP.new
-        print "#{@ip.ip} => "
-        if @ip.ipaddr.private?
-          puts "private IP, #{fetch_will_fail_warning}".color(:red)
+        ip = Dumper::Utility::IP.new
+        print "#{ip.address} => "
+        if ip.private?
+          puts "Private IP, #{fetch_will_fail_warning}".color(:red)
         else
-          puts 'public IP, good'.color(:green)
+          puts 'Public IP, good'.color(:green)
         end
       end
 
@@ -64,7 +64,7 @@ module Dumper
       end
 
       def fetch_will_fail_warning
-        'warning - fetch from dumper.io to this server will fail, you will need to use the dumper gem with rails.'
+        'warning - remote fetch from dumper.io to this server will fail. You will need to use the dumper gem with rails.'
       end
     end
   end

data/lib/dumper/dependency.rb

@@ -1,15 +1,16 @@
 module Dumper
   class Dependency
     LIBS = {
-      'thor' =>       { :require => 'thor',       :version => '~> 0.14' },
-      'rainbow' =>    { :require => 'rainbow',    :version => '~> 1.1.4' },
-      'net-ntp' =>    { :require => 'net/ntp',    :version => '~> 2.1.1' },
+      'thor'       => { :version => '~> 0.19' },
+      'rainbow'    => { :version => '~> 2.1', :require => 'rainbow/ext/string' },
+      'net-ntp'    => { :version => '~> 2.1', :require => 'net/ntp' },
+      'ipaddress'  => { :version => '~> 0.8.3' },
     }
 
     def self.load(name)
       begin
-        gem(name, LIBS[name][:version])
-        require(LIBS[name][:require])
+        gem name, LIBS[name][:version]
+        require LIBS[name][:require] || name
       rescue LoadError
         abort <<-EOS
 Dependency missing: #{name}

data/lib/dumper/job.rb

@@ -4,7 +4,7 @@ require 'posix/spawn'
 module Dumper
   class Job
     include POSIX::Spawn
-    include Dumper::Utility::LoggingMethods
+    include Dumper::Utility::Log
 
     def initialize(agent, job)
       @agent = agent

data/lib/dumper/utility/ip.rb

@@ -0,0 +1,20 @@
+Dumper::Dependency.load('ipaddress')
+require 'forwardable'
+
+module Dumper
+  module Utility
+    class IP
+      extend Forwardable
+      def_delegators :@ip, :address, :private?
+
+      def initialize(*args)
+        UDPSocket.open do |s|
+          s.do_not_reverse_lookup = true
+          s.connect '64.233.187.99', 1
+          @ip = IPAddress(s.addr.last)
+        end
+        raise "#{@ip.address} is not IPv4!" unless @ip.ipv4?
+      end
+    end
+  end
+end

data/lib/dumper/{utility.rb → utility/log.rb}

@@ -1,39 +1,25 @@
-require 'ipaddr'
 require 'logger'
 
 module Dumper
   module Utility
-    class IP
-      attr_reader :ip, :ipaddr
-
-      def initialize(*args)
-        disable_reverse_lookup do
-          UDPSocket.open do |s|
-            s.connect '64.233.187.99', 1
-            @ip = s.addr.last
-          end
-        end
-        @ipaddr = Dumper::Utility::IPAddr.new(@ip)
+    module Log
+      def logger
+        @@logger ||= Dumper::Utility::SlimLogger.new("#{Rails.root}/log/dumper_agent.log", 1, 10.megabytes)
       end
 
-      def disable_reverse_lookup
-        orig = Socket.do_not_reverse_lookup
-        Socket.do_not_reverse_lookup = true
-        begin
-          yield
-        ensure
-          Socket.do_not_reverse_lookup = orig
-        end
+      def stdout_logger
+        @@stdout_logger ||= Dumper::Utility::SlimLogger.new(STDOUT)
       end
-    end
 
-    class IPAddr < ::IPAddr
-      def private?
-        return false unless self.ipv4?
+      def log(msg, level=:info)
+        stdout_logger.send level, "** [Dumper] " + msg
+        return unless true #should_log?
+        logger.send level, msg
+      end
 
-        [ IPAddr.new("10.0.0.0/8"),
-          IPAddr.new("172.16.0.0/12"),
-          IPAddr.new("192.168.0.0/16") ].any?{|i| i.include? self }
+      def log_last_error
+        log [ $!.class.name, $!.to_s ].join(', ')
+        log ("\n" << $!.backtrace.join("\n")), :debug
       end
     end
 
@@ -52,32 +38,5 @@ module Dumper
         end
       end
     end
-
-    module LoggingMethods
-      def logger
-        @@logger ||= Dumper::Utility::SlimLogger.new("#{Rails.root}/log/dumper_agent.log", 1, 10.megabytes)
-      end
-
-      def stdout_logger
-        @@stdout_logger ||= Dumper::Utility::SlimLogger.new(STDOUT)
-      end
-
-      def log(msg, level=:info)
-        stdout_logger.send level, "** [Dumper] " + msg
-        return unless true #should_log?
-        logger.send level, msg
-      end
-
-      def log_last_error
-        log [ $!.class.name, $!.to_s ].join(', ')
-        log ("\n" << $!.backtrace.join("\n")), :debug
-      end
-    end
-
-    module ObjectFinder
-      def find_instance_in_object_space(klass)
-        ObjectSpace.each_object(klass).first
-      end
-    end
   end
 end

data/lib/dumper/utility/object_finder.rb

@@ -0,0 +1,9 @@
+module Dumper
+  module Utility
+    module ObjectFinder
+      def find_instance_in_object_space(klass)
+        ObjectSpace.each_object(klass).first
+      end
+    end
+  end
+end

data/lib/dumper/version.rb

@@ -1,3 +1,3 @@
 module Dumper
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dumper
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Kenn Ejima
@@ -165,7 +165,9 @@ files:
 - lib/dumper/job.rb
 - lib/dumper/patch.rb
 - lib/dumper/stack.rb
-- lib/dumper/utility.rb
+- lib/dumper/utility/ip.rb
+- lib/dumper/utility/log.rb
+- lib/dumper/utility/object_finder.rb
 - lib/dumper/version.rb
 - lib/generators/dumper/install_generator.rb
 - lib/generators/dumper/templates/dumper.rb.erb