zaphod 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8b985fa07e31d0a2e442bfb3f0af08f485c16b71
-  data.tar.gz: 4bc888ba21ba077563bda11553ea603386c03724
+  metadata.gz: 9716d2d2bc5d2523195132e42ef2cfe697956449
+  data.tar.gz: 02e7e816192a3437b1a2c6b946ed6a97780bf018
 SHA512:
-  metadata.gz: 765fa47d7730e1890073fd6e0927d49b01a986c1e16750a1d36df8fc62e7c12a4dcc60a0890a10d4572b7283d41ac0c08bfbae96ca714b5f783d0ada78053e97
-  data.tar.gz: 969ec8dbfd997dec29bbea65b362448bca2603db4597d29e41ae476ae09492240afbce44af73200e97705a29c701de6ad0b709cea36c5bb13f1aab9833229d1a
+  metadata.gz: c96b73e834d184a91993a6f95f7a74bb101d7bc2763f1f4a99bcbbf1bf670fbcc8f34172b6fc06ff31365f2223fc6f3f62b750778ee7b91650921d7da95cb15d
+  data.tar.gz: 7a4d12e3294f2e00b87ab66545f7e6ca9ffbd6ff2d29c10099c2bb5d460f27e28f2a71b2e973f8dd40ad4bafb281f09dd03ee34949705dd92d5fb844e4b07032

data/.gitignore

@@ -9,3 +9,5 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+.bundle
+.ruby-version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    zaphod (1.0.0)
+    zaphod (1.0.1)
       grit (~> 2.5)
       simplecov (~> 0.8)
 

data/README.org

@@ -36,7 +36,7 @@ Catch, and publicly embarrass, untested commits into git.
      Zaphod.setup do |configuration|
        configuration.on_failure do
          Pony.mail(
-           to: 'you@example.com',
+           to: 'your-team@example.com',
            subject: "Someone is trying to commit untested code!"
            )
          raise SystemExit.new( -1 )

data/lib/simplecov/formatter/zaphod_formatter.rb

@@ -3,9 +3,9 @@ require "zaphod/change_set"
 module SimpleCov
   module Formatter
     # Send a set of File:Line tuples to a Zaphod class that intersects
-    # it with a set from the last git commit. Blow up and send an
-    # email if the intersection reveals lines in the current commit
-    # that are uncovered.
+    # it with a set from the last git commit. Call the failure hook if
+    # the intersection reveals lines in the current changeset that are
+    # uncovered.
     #
     # Aborting with a non-zero exit code should propagate properly
     # through SimpleCov.
@@ -21,7 +21,15 @@ module SimpleCov
         uncovered_codeset = uncovered result
         changed_codeset   = source_control.changes
 
-        diff = uncovered_codeset.intersection( changed_codeset )
+        diff = changed_codeset.intersection( uncovered_codeset )
+        if $DEBUG || ENV["DEBUG"]
+          require "pp"
+          pp(
+            "--- UNCOVERED ---", uncovered_codeset,
+            "---  CHANGED  ---", changed_codeset,
+            "---    DIFF   ---", diff
+            )
+        end
         unless diff.empty?
           Zaphod.configuration.on_failure.call diff
         end

data/lib/zaphod/change_set.rb

@@ -5,10 +5,20 @@ module Zaphod
   class ChangeSet
     extend Forwardable
     attr_reader :changes
-    def_delegators :@changes, :empty?, :each, :map, :first, :length, :intersection
+    def_delegators :@changes, :empty?, :each, :map, :first, :length, :include?, :add, :any?
 
-    def initialize( changes )
+    def initialize( changes=[] )
       @changes = Set.new changes
     end
+
+    def intersection( other )
+      changes.each_with_object( self.class.new ) do |change, set|
+        set.add( change ) if other.any? { |c| c.eql? change }
+      end
+    end
+
+    def ==( other )
+      changes == other.changes
+    end
   end
 end

data/lib/zaphod/code_change.rb

@@ -13,11 +13,13 @@ module Zaphod
     end
 
     def hash()
-      [path, source].hash
+      [path].hash
     end
 
     def inspect()
-      "<#{self.class.name} #{path}>\n" + source.join( "\n" )
+      "#{self.class.name}.new(\"#{path}\", [\n" +
+        source.map( &:inspect ).join( ",\n" ) +
+        "])"
     end
   end
 end

data/lib/zaphod/git.rb

@@ -29,7 +29,7 @@ module Zaphod
     end
 
     def relativize_paths( patch_map )
-      patch_map.dup.each_with_object( map = {}) do |pair, h|
+      patch_map.dup.each_with_object( map = {} ) do |pair, h|
         h[".#{pair.first}"] = pair.last
       end
       map

data/lib/zaphod/version.rb

@@ -1,3 +1,3 @@
 module Zaphod
-  VERSION = "1.0.0"
+  VERSION = "1.0.1"
 end

data/lib/zaphod.rb

@@ -1,4 +1,3 @@
-require "simplecov"
 require 'simplecov/formatter/zaphod_formatter'
 require 'zaphod/code_change'
 require 'zaphod/source_control'

data/spec/simplecov/formatter/zaphod_formatter_spec.rb

@@ -25,7 +25,10 @@ describe SimpleCov::Formatter::ZaphodFormatter do
     context "when the uncovered lines include the current changes" do
       let( :source_changes ) do
         Zaphod::ChangeSet.new([
-            Zaphod::CodeChange.new( "./lib/zaphod/spike.rb", ["      @var = \"foo\"\n"] )
+            Zaphod::CodeChange.new(
+              "./lib/zaphod/spike.rb",
+              ["      @var = \"foo\"\n"]
+              )
           ])
       end
 
@@ -41,15 +44,11 @@ describe SimpleCov::Formatter::ZaphodFormatter do
 
         subject.format result
 
-        expect( failed ).to eq( source_changes.changes )
+        expect( failed ).to eq( source_changes )
       end
     end
 
     context "when the uncovered lines do not include the current changes" do
-      before :each do
-        stub( source_control ).changes { Hash.new }
-      end
-
       it "proceeds normally" do
         subject.format result
       end

data/spec/zaphod/change_set_spec.rb

@@ -52,7 +52,36 @@ module Zaphod
 
       it do
         expect( set1.intersection( set2 ) ).
-          to eq( Set.new([ CodeChange.new( "/dev/null", ["baz"] ) ]) )
+          to eq( ChangeSet.new([ CodeChange.new( "/dev/null", ["baz"] ) ]) )
+      end
+
+      context "when the changes are 'eql' but not identical" do
+        let( :coverage_change ) do
+          CodeChange.new(
+            "/app/controllers/tags_controller.rb", [
+              "      ) unless Tag.find_by_name(params[:tag_name])\n",
+              "    respond_to do |format|\n",
+              "      if tag.valid?\n",
+              "        format.js {render :json => {:success => true, :message => \"Tag Creation Successful!\"}}\n",
+              "        format.js {render :json => {:success => false, :message => tag.errors.inspect}}\n",
+              "    puts \"ha HA! I'm a cheater!\"\n"])
+        end
+
+        let( :git_change ) do
+          CodeChange.new(
+            "/app/controllers/tags_controller.rb", [
+              "\n",
+              "  def uncovered_method\n",
+              "    puts \"ha HA! I'm a cheater!\"\n",
+              "  end\n"])
+        end
+
+        let( :set1 ) { described_class.new([ coverage_change ]) }
+        let( :set2 ) { described_class.new([ git_change ]) }
+
+        it "does content based intersection" do
+          expect( set1.intersection( set2 ) ).to_not be_empty
+        end
       end
     end
   end

data/spec/zaphod/code_change_spec.rb

@@ -56,6 +56,31 @@ module Zaphod
 
         it( "is true" ) { expect( change1 ).to eql( change2 ) }
       end
+
+      context "when weird things happen" do
+        let( :coverage_change ) do
+          CodeChange.new(
+            "/app/controllers/tags_controller.rb", [
+              "      ) unless Tag.find_by_name(params[:tag_name])\n",
+              "    respond_to do |format|\n",
+              "      if tag.valid?\n",
+              "        format.js {render :json => {:success => true, :message => \"Tag Creation Successful!\"}}\n",
+              "        format.js {render :json => {:success => false, :message => tag.errors.inspect}}\n",
+              "    puts \"ha HA! I'm a cheater!\"\n"])
+        end
+
+        let( :git_change ) do
+          CodeChange.new(
+            "/app/controllers/tags_controller.rb", [
+              "\n",
+              "  def uncovered_method\n",
+              "    puts \"ha HA! I'm a cheater!\"\n",
+              "  end\n"])
+        end
+
+        it { expect( coverage_change ).to eql( git_change ) }
+        it { expect( coverage_change.hash ).to eql( git_change.hash ) }
+      end
     end
 
     describe "#hash" do
@@ -68,6 +93,7 @@ module Zaphod
       end
 
       it "differs for two changes that have inequal sources" do
+        pending "breaks Set intersection... think harder on this"
         expect( change2.hash ).to_not eq( change3.hash )
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zaphod
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Toby Tripp
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-04 00:00:00.000000000 Z
+date: 2014-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grit
@@ -185,10 +185,8 @@ extensions: []
 extra_rdoc_files:
 - README.org
 files:
-- ".bundle/config"
 - ".gitignore"
 - ".rspec"
-- ".ruby-version"
 - Gemfile
 - Gemfile.lock
 - Guardfile

data/.bundle/config

@@ -1 +0,0 @@
---- {}

data/.ruby-version

@@ -1 +0,0 @@
-2.1.0