data_miner 1.3.6 → 1.3.7

data/Rakefile

@@ -23,3 +23,27 @@ begin
 rescue LoadError
    puts "Rdoc is not available"
 end
+
+gemspec = eval(File.read(Dir["*.gemspec"].first))
+
+desc "Validate the gemspec"
+task :gemspec do
+  gemspec.validate
+end
+
+desc "Build gem locally"
+task :build => :gemspec do
+  system "gem build #{gemspec.name}.gemspec"
+  FileUtils.mkdir_p "pkg"
+  FileUtils.mv "#{gemspec.name}-#{gemspec.version}.gem", "pkg"
+end
+
+desc "Install gem locally"
+task :install => :build do
+  system "gem install pkg/#{gemspec.name}-#{gemspec.version}"
+end
+
+desc "Clean automatically generated files"
+task :clean do
+  FileUtils.rm_rf "pkg"
+end

data/lib/data_miner.rb

@@ -49,7 +49,18 @@ class DataMiner
     end
   end
   
-  attr_accessor :logger
+  attr_writer :logger
+  def logger
+    return @logger if @logger
+    if defined?(::Rails)
+      @logger = ::Rails.logger
+    elsif defined?(::ActiveRecord) and active_record_logger = ::ActiveRecord::Base.logger
+      @logger = active_record_logger
+    else
+      require 'logger'
+      @logger = ::Logger.new $stderr
+    end
+  end
 
   def resource_names
     @resource_names ||= []
@@ -58,19 +69,7 @@ class DataMiner
   def call_stack
     @call_stack ||= []
   end
-  
-  def start_logging
-    if logger.nil?
-      if defined? ::Rails
-        self.logger = ::Rails.logger
-      else
-        require 'logger'
-        self.logger = ::Logger.new $stderr
-      end
-    end
-    ::ActiveRecord::Base.logger = logger
-  end
-    
+      
   # Mine data. Defaults to all resource_names touched by DataMiner.
   #
   # Options

data/lib/data_miner/active_record_extensions.rb

@@ -27,9 +27,7 @@ class DataMiner
     end
     
     def data_miner(options = {}, &blk)
-      ::DataMiner.instance.start_logging
-
-      ::DataMiner.instance.resource_names.push self.name unless ::DataMiner.instance.resource_names.include? self.name
+      ::DataMiner.instance.resource_names.push name unless ::DataMiner.instance.resource_names.include?(name)
 
       unless options[:append]
         self.data_miner_config = ::DataMiner::Config.new self

data/lib/data_miner/config.rb

@@ -60,7 +60,7 @@ class DataMiner
         steps.each do |step|
           time = ::Benchmark.realtime { step.run }
           resource.reset_column_information
-          ::DataMiner.logger.info %{Ran #{step.inspect} in #{time.to_i}}
+          DataMiner.logger.info %{Ran #{step.inspect} in #{time.to_i}}
         end
         finished = true
       rescue Finish

data/lib/data_miner/import.rb

@@ -17,13 +17,13 @@ class DataMiner
       @options.stringify_keys!
       # legacy
       if @options.has_key? 'table'
-        ::DataMiner.logger.info "Warning: 'table' is no longer an allowed option, taking the url from it and ignoring the rest"
+        DataMiner.logger.warn "'table' is no longer an allowed option, taking the url from it and ignoring the rest"
         table_instance = @options.delete 'table'
         @options['url'] = table_instance.url
       end
       # legacy
       if @options.has_key?('errata') and not @options['errata'].is_a?(::Hash)
-        ::DataMiner.logger.info "Warning: 'errata' must be a hash of Errata options. taking the URL from the Errata instance you provided and ignoring everything else"
+        DataMiner.logger.warn "'errata' must be a hash of Errata options. taking the URL from the Errata instance you provided and ignoring everything else"
         errata_instance = @options.delete 'errata'
         @options['errata'] = { 'url' => errata_instance.options['url'] }
       end
@@ -83,7 +83,7 @@ class DataMiner
         begin
           record.save!
         rescue
-          ::DataMiner.logger.warn "[data_miner] Got #{$!.inspect} when trying to save #{row}"
+          DataMiner.logger.warn "[data_miner] Got #{$!.inspect} when trying to save #{row}"
         end
       end
       free

data/lib/data_miner/version.rb

@@ -1,3 +1,3 @@
 class DataMiner
-  VERSION = '1.3.6'
+  VERSION = '1.3.7'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: data_miner
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.3.7
   prerelease: 
 platform: ruby
 authors:
@@ -15,7 +15,7 @@ date: 2012-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: remote_table
-  requirement: &2164579240 !ruby/object:Gem::Requirement
+  requirement: &2152340720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: 1.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164579240
+  version_requirements: *2152340720
 - !ruby/object:Gem::Dependency
   name: activerecord
-  requirement: &2164578480 !ruby/object:Gem::Requirement
+  requirement: &2152340000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164578480
+  version_requirements: *2152340000
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2164577700 !ruby/object:Gem::Requirement
+  requirement: &2152339320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: 2.3.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164577700
+  version_requirements: *2152339320
 - !ruby/object:Gem::Dependency
   name: conversions
-  requirement: &2164577080 !ruby/object:Gem::Requirement
+  requirement: &2152338720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -56,10 +56,10 @@ dependencies:
         version: 1.4.4
   type: :runtime
   prerelease: false
-  version_requirements: *2164577080
+  version_requirements: *2152338720
 - !ruby/object:Gem::Dependency
   name: blockenspiel
-  requirement: &2164576420 !ruby/object:Gem::Requirement
+  requirement: &2152338100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -67,10 +67,10 @@ dependencies:
         version: 0.3.2
   type: :runtime
   prerelease: false
-  version_requirements: *2164576420
+  version_requirements: *2152338100
 - !ruby/object:Gem::Dependency
   name: errata
-  requirement: &2164575740 !ruby/object:Gem::Requirement
+  requirement: &2152337460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -78,10 +78,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *2164575740
+  version_requirements: *2152337460
 - !ruby/object:Gem::Dependency
   name: posix-spawn
-  requirement: &2164575260 !ruby/object:Gem::Requirement
+  requirement: &2152337000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -89,10 +89,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2164575260
+  version_requirements: *2152337000
 - !ruby/object:Gem::Dependency
   name: mini_record-compat
-  requirement: &2164574580 !ruby/object:Gem::Requirement
+  requirement: &2152336520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,10 +100,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164574580
+  version_requirements: *2152336520
 - !ruby/object:Gem::Dependency
   name: loose_tight_dictionary
-  requirement: &2164573940 !ruby/object:Gem::Requirement
+  requirement: &2152335880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -111,10 +111,10 @@ dependencies:
         version: 0.0.5
   type: :development
   prerelease: false
-  version_requirements: *2164573940
+  version_requirements: *2152335880
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &2164573360 !ruby/object:Gem::Requirement
+  requirement: &2152335360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -122,10 +122,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164573360
+  version_requirements: *2152335360
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2164572800 !ruby/object:Gem::Requirement
+  requirement: &2152351060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -133,10 +133,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164572800
+  version_requirements: *2152351060
 - !ruby/object:Gem::Dependency
   name: mysql
-  requirement: &2164572140 !ruby/object:Gem::Requirement
+  requirement: &2152350500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -144,10 +144,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164572140
+  version_requirements: *2152350500
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2164571480 !ruby/object:Gem::Requirement
+  requirement: &2152349960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -155,7 +155,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2164571480
+  version_requirements: *2152349960
 description: Mine remote data into your ActiveRecord models. You can also convert
   units.
 email: