gem_publisher 1.1.0 → 1.1.1

data/lib/gem_publisher/publisher.rb

@@ -18,7 +18,7 @@ module GemPublisher
     end
 
     def publish_if_updated(method)
-      return unless version_bumped?
+      return if version_released?
       @builder.build(@gemspec).tap { |gem|
         @pusher.push gem, method
         @git_remote.add_tag "v#@version"
@@ -26,13 +26,12 @@ module GemPublisher
     end
 
   private
-    def version_bumped?
-      last_release = @git_remote.tags.
+    def version_released?
+      releases = @git_remote.tags.
         select { |t| t =~ /^v\d+(\.\d+)+/ }.
-        map { |t| t.scan(/\d+/).map(&:to_i) }.
-        sort.last
+        map { |t| t.scan(/\d+/).map(&:to_i) }
       this_release = @version.split(/\./).map(&:to_i)
-      this_release != last_release
+      releases.include?(this_release)
     end
 
     def tag_remote

data/lib/gem_publisher/version.rb

@@ -1,3 +1,3 @@
 module GemPublisher
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 end

data/test/publisher_test.rb

@@ -15,6 +15,18 @@ module GemPublisher
       assert_nil p.publish_if_updated(:bogus)
     end
 
+    def test_should_not_do_anything_and_return_nil_if_version_has_already_been_tagged_even_with_a_later_tag
+      p = Publisher.new(data_file_path("example.gemspec"))
+      p.builder = mock
+      p.builder.expects(:build).never
+      p.pusher = mock
+      p.pusher.expects(:push).never
+      p.git_remote = mock
+      p.git_remote.stubs(:tags).returns(%w[v0.0.1 v0.0.2 v0.0.3 v0.1.0])
+      p.git_remote.expects(:add_tag).never
+      assert_nil p.publish_if_updated(:bogus)
+    end
+
     def test_should_build_and_tag_and_publish_and_return_gem_name_if_version_has_changed
       gemspec = data_file_path("example.gemspec")
       p = Publisher.new(gemspec)
@@ -41,5 +53,17 @@ module GemPublisher
       p.git_remote.expects(:add_tag).with("v0.0.3")
       assert_equal "foo-0.0.3.gem", p.publish_if_updated(:method)
     end
+
+    def test_should_build_and_tag_and_publish_and_return_gem_name_if_the_current_version_has_not_been_released
+      p = Publisher.new(data_file_path("example.gemspec"))
+      p.builder = mock
+      p.builder.expects(:build).returns("foo-0.0.3.gem")
+      p.pusher = mock
+      p.pusher.expects(:push)
+      p.git_remote = mock
+      p.git_remote.stubs(:tags).returns(%w[v0.0.1 v0.0.2 v0.1.0])
+      p.git_remote.expects(:add_tag).with("v0.0.3")
+      assert_equal "foo-0.0.3.gem", p.publish_if_updated(:method)
+    end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: gem_publisher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors: 
 - Paul Battley
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-06-07 00:00:00 Z
+date: 2012-07-18 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mocha
@@ -73,7 +73,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -660420523550429852
+      hash: 4214267775999231123
       segments: 
       - 0
       version: "0"
@@ -82,14 +82,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -660420523550429852
+      hash: 4214267775999231123
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.8.12
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Automatically build, tag, and push gems