sniff 0.8.1 → 0.8.2

data/lib/sniff.rb

@@ -1,4 +1,6 @@
 require 'data_miner'
+require 'create_table'
+require 'logger'
 
 module Sniff
   extend self

data/lib/sniff/database.rb

@@ -1,6 +1,4 @@
 require 'active_support'
-require 'fileutils'
-require 'logger'
 require 'sqlite3'
 
 module Sniff
@@ -12,7 +10,7 @@ module Sniff
       # options: 
       # * :earth is the list of domains Earth.init should load (default: none)
       # * :load_data determines whether fixture data is loaded (default: true)
-      # * :fixtures_path is the path to your gem's fixtures (default: local_root/lib/db/fixtures)
+      # * :fixtures_path is the path to your gem's fixtures (default: local_root/features/support/db/fixtures)
       def init(local_root, options = {})
         db_init options
         earth_init(options[:earth])
@@ -55,12 +53,12 @@ module Sniff
       end
     end
 
-    attr_accessor :root, :lib_path, :fixtures_path,
+    attr_accessor :root, :test_support_path, :fixtures_path,
       :load_data, :fixtures, :logger
 
     def initialize(root, options)
       self.root = root
-      self.lib_path = File.join(root, 'lib', 'test_support')
+      self.test_support_path = File.join(root, 'features', 'support')
       self.load_data = options[:load_data]
       self.fixtures_path = options[:fixtures_path]
       self.logger = Sniff.logger
@@ -76,7 +74,7 @@ module Sniff
     end
 
     def fixtures_path
-      @fixtures_path ||= File.join(lib_path, 'db', 'fixtures')
+      @fixtures_path ||= File.join(test_support_path, 'db', 'fixtures')
     end
 
     def fixtures
@@ -91,16 +89,17 @@ module Sniff
 
     def emitter_class
       return @emitter_class unless @emitter_class.nil?
-      record_class_file = Dir.glob(File.join(root, 'lib', 'test_support', '*_record.rb')).first
-      if record_class_file
-        record_class = File.read(record_class_file)
+      record_class_path = Dir.glob(File.join(test_support_path, '*_record.rb')).first
+      if record_class_path
+        require record_class_path
+        record_class = File.read(record_class_path)
         klass = record_class.scan(/class ([^\s]*Record)/).flatten.first
         @emitter_class = klass.constantize
       end
     end
 
     def create_emitter_table
-      emitter_class.execute_schema if emitter_class
+      emitter_class.create_table! if emitter_class
     end
 
     def read_fixtures
@@ -114,15 +113,15 @@ module Sniff
 
     def populate_fixtures
       Encoding.default_external = 'UTF-8' if Object.const_defined?('Encoding')
-      Earth.resource_names.each do |klass|
-        klass = klass.pluralize unless Object.const_defined?(klass)
-        if Object.const_defined?(klass) and klass.constantize.table_exists?
-          object = klass.constantize
-          table_name = object.table_name
+      Earth.resources.each do |resource|
+        next unless Object.const_defined?(resource)
+        resource_model = resource.constantize
+        if resource_model.table_exists?
+          table_name = resource_model.table_name
           fixture_file = File.join(fixtures_path, table_name + '.csv')
           if File.exist? fixture_file
             log "Loading fixture #{fixture_file}"
-            Fixtures.create_fixtures(fixtures_path, table_name, klass => table_name)
+            Fixtures.create_fixtures(fixtures_path, table_name, resource => table_name)
           end
         end
       end

data/lib/sniff/rake_tasks.rb

@@ -54,18 +54,42 @@ module Sniff
         desc 'Set up and build rocco docs'
         task :docs_init => :rocco
 
+        task :google_analyzed_rocco => :rocco do
+          source = File.read "docs/lib/#{gemname}/carbon_model.html"
+          unless source =~ /_gaq/
+            source.sub! '</head>', <<-HTML
+  <script type="text/javascript">
+    var _gaq = _gaq || [];
+    _gaq.push(['_setAccount', 'UA-1667526-20']);
+    _gaq.push(['_trackPageview']);
+
+    (function() {
+      var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+      ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+      var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+    })();
+  </script>
+</head>
+          HTML
+            File.open "docs/lib/#{gemname}/carbon_model.html", 'w' do |f|
+              f.puts source
+            end
+          end
+        end
+
         desc 'Rebuild rocco docs'
-        task :docs => ['pages:sync', :rocco]
+        task :docs => ['pages:sync', :google_analyzed_rocco]
         directory 'docs/'
 
-        desc 'Update gh-pages branch'
+        desc 'Update rocco docs on gh-pages branch'
         task :pages => :docs do
           rev = `git rev-parse --short HEAD`.strip
           sh "mv docs/lib/#{gemname}/carbon_model.html docs/carbon_model.html"
           git 'add *.html', 'docs'
-          git "commit -m 'rebuild pages from #{rev}'", 'docs' do |ok,res|
+          puts "Commiting with message 'Rebuild pages from #{rev}'"
+          git "commit -m 'Rebuild pages from #{rev}'", 'docs' do |ok,res|
             if ok
-              verbose { puts "gh-pages updated" }
+              puts "Pushing to HEAD"
               git 'push -q o HEAD:gh-pages', 'docs' unless ENV['NO_PUSH']
             end
           end

data/lib/sniff/version.rb

@@ -1,3 +1,3 @@
 module Sniff
-  VERSION = "0.8.1"
+  VERSION = "0.8.2"
 end

data/lib/test_support/cucumber/step_definitions/committee_steps.rb

@@ -55,7 +55,7 @@ When /^the "(.*)" committee is calculated$/ do |committee_name|
 #  if @report.nil?
 #    raise "The committee #{@committee.name} did not come to a conclusion. Characteristics: #{@characteristics.inspect}"
 #  else
-    @characteristics[committee_name.to_sym] = @report.andand.conclusion
+    @characteristics[committee_name.to_sym] = @report.try(:conclusion)
 #  end
 end
 
@@ -85,16 +85,16 @@ Then /^the conclusion should not comply with standards? "(.*)"$/ do |standard_li
 end
 
 Then /^the conclusion of the committee should be "(.*)"$/ do |conclusion|
-  compare_values(@report.andand.conclusion, conclusion)
+  compare_values(@report.try(:conclusion), conclusion)
 end
 
 Then /^the conclusion of the committee should be timeframe "(.*)"$/ do |conclusion|
   timeframe = Timeframe.interval(conclusion)
-  compare_values(@report.andand.conclusion, timeframe)
+  compare_values(@report.try(:conclusion), timeframe)
 end
 
 Then /^the conclusion of the committee should be nil$/ do
-  compare_values(@report.andand.conclusion, nil)
+  compare_values(@report.try(:conclusion), nil)
 end
 
 Then /^the conclusion of the committee should include a key of "(.*)" and value "(.*)"$/ do |key, value|

data/spec/fixtures/dirigible/lib/dirigible/data.rb

@@ -2,13 +2,9 @@ module BrighterPlanet
   module Dirigible
     module Data
       def self.included(base)
-        base.data_miner do
-          schema do
-            float    'fuel_efficiency'
-            float    'annual_distance_estimate'
-          end
-          
-          process :run_data_miner_on_belongs_to_associations
+        base.create_table do
+          float    'fuel_efficiency'
+          float    'annual_distance_estimate'
         end
       end
     end

data/spec/lib/sniff/database_spec.rb

@@ -1,7 +1,4 @@
 require 'spec_helper'
-require 'fileutils'
-require 'data_miner'
-require 'logger'
 
 describe Sniff::Database do
   describe '#connect' do
@@ -10,18 +7,18 @@ describe Sniff::Database do
     before :all do
       $:.unshift File.join(dirigible_path, 'lib')
       require File.join('dirigible')
-      DataMiner.logger = Logger.new nil
+      DataMiner.logger = Logger.new $stdout
     end
 
     it 'should load the air domain' do
       Sniff.init(dirigible_path, :earth => :air, :apply_schemas => true)
       Airport.count.should == 0 # we don't have fixtures for this here
-      ZipCode.count.should > 0
-      expect { AutomobileFuelType }.should raise_error
+      expect { ZipCode.count }.should raise_error
+      expect { AutomobileFuelType.count }.should raise_error
     end
     it 'should load data for all domains' do
       Sniff.init(dirigible_path, :earth => :all, :apply_schemas => true)
-      PetroleumAdministrationForDefenseDistrict.all.count.should == 7
+      PetroleumAdministrationForDefenseDistrict.count.should == 7
       ZipCode.count.should > 0
     end
     it 'should load a schema for the emitter record' do

metadata

@@ -1,191 +1,200 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: sniff
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.8.2
   prerelease: 
-  version: 0.8.1
 platform: ruby
-authors: 
+authors:
 - Derek Kastner
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-06-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-06-13 00:00:00.000000000 -04:00
+default_executable: 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2155180580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: 3.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: aaronh-chronic
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2155180580
+- !ruby/object:Gem::Dependency
+  name: aaronh-chronic
+  requirement: &2155180060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.3.9
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: bueller
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2155180060
+- !ruby/object:Gem::Dependency
+  name: bueller
+  requirement: &2155179540 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: cucumber
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2155179540
+- !ruby/object:Gem::Dependency
+  name: create_table
+  requirement: &2155179080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: earth
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2155179080
+- !ruby/object:Gem::Dependency
+  name: cucumber
+  requirement: &2155178440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *2155178440
+- !ruby/object:Gem::Dependency
+  name: earth
+  requirement: &2155177840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.5
   type: :runtime
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2155177840
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2155177220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.9.0
   type: :runtime
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: rcov
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2155177220
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2155176820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: rdoc
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2155176820
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &2155176300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: dkastner-rocco
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2155176300
+- !ruby/object:Gem::Dependency
+  name: dkastner-rocco
+  requirement: &2155175420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2155175420
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &2155174780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: sqlite3-ruby
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2155174780
+- !ruby/object:Gem::Dependency
+  name: sqlite3-ruby
+  requirement: &2155174140 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: timecop
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2155174140
+- !ruby/object:Gem::Dependency
+  name: timecop
+  requirement: &2155173660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
-  name: timeframe
   prerelease: false
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  version_requirements: *2155173660
+- !ruby/object:Gem::Dependency
+  name: timeframe
+  requirement: &2155172900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.8
   type: :runtime
-  version_requirements: *id013
-- !ruby/object:Gem::Dependency 
-  name: sandbox
   prerelease: false
-  requirement: &id014 !ruby/object:Gem::Requirement 
+  version_requirements: *2155172900
+- !ruby/object:Gem::Dependency
+  name: sandbox
+  requirement: &2155172460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id014
-- !ruby/object:Gem::Dependency 
-  name: emitter
   prerelease: false
-  requirement: &id015 !ruby/object:Gem::Requirement 
+  version_requirements: *2155172460
+- !ruby/object:Gem::Dependency
+  name: emitter
+  requirement: &2155171900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.5.0
   type: :development
-  version_requirements: *id015
+  prerelease: false
+  version_requirements: *2155171900
 description: Provides development and test environment for emitter gems
 email: derek.kastner@brighterplanet.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.markdown
-files: 
+files:
 - lib/sniff/database.rb
 - lib/sniff/emitter.rb
 - lib/sniff/rake_tasks.rb
@@ -229,34 +238,36 @@ files:
 - spec/lib/sniff/rake_tasks_spec.rb
 - spec/lib/test_support/cucumber/support/values_spec.rb
 - spec/spec_helper.rb
+has_rdoc: true
 homepage: https://github.com/brighterplanet/sniff
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: 3830723489194360646
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.3
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Test support for Brighter Planet carbon gems
-test_files: 
+test_files:
 - spec/db/emitter_data.sqlite3
 - spec/db/schema_output
 - spec/fixtures/dirigible/lib/dirigible/carbon_model.rb