gem_publisher 0.0.3 → 0.0.4

data/lib/gem_publisher.rb

@@ -3,15 +3,17 @@ require "gem_publisher/version"
 
 module GemPublisher
 
-  # Publish a gem based on the supplied gemspec and version via
-  # method, iff this version has not already been released and tagged
-  # in the origin Git repository.
+  # Publish a gem based on the supplied gemspec via supplied method, iff this
+  # version has not already been released and tagged in the origin Git
+  # repository.
+  #
+  # Version is derived from the gemspec.
   #
   # If a remote tag matching the version already exists, nothing is done.
   # Otherwise, the gem is built, pushed, and tagged.
   #
-  # Version should be a string of the form "1.2.3". Tags are expected to
-  # be of the form "v1.2.3", and generated tags follow this pattern.
+  # Tags are expected to be of the form "v1.2.3", and generated tags follow
+  # this pattern.
   #
   # Method should be one of :rubygems or :gemfury, and the requisite
   # credentials for the corresponding push command line tools must exist.
@@ -19,7 +21,7 @@ module GemPublisher
   # Returns the gem file name if a gem was published; nil otherwise. A
   # CliFacade::Error will be raised if a command fails.
   #
-  def self.publish_if_updated(gemspec, version, method=:rubygems)
-    Publisher.new(gemspec, version).publish_if_updated(method)
+  def self.publish_if_updated(gemspec, method=:rubygems)
+    Publisher.new(gemspec).publish_if_updated(method)
   end
 end

data/lib/gem_publisher/publisher.rb

@@ -1,14 +1,17 @@
 require "gem_publisher/git_remote"
 require "gem_publisher/builder"
 require "gem_publisher/pusher"
+require "rubygems/specification"
 
 module GemPublisher
   class Publisher
     attr_accessor :git_remote, :builder, :pusher
 
-    def initialize(gemspec, version)
+    def initialize(gemspec)
       @gemspec = gemspec
-      @version = version
+
+      @version = eval(File.read(gemspec)).version.to_s
+
       @git_remote = GitRemote.new
       @builder    = Builder.new
       @pusher     = Pusher.new

data/lib/gem_publisher/version.rb

@@ -1,3 +1,3 @@
 module GemPublisher
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/test/builder_test.rb

@@ -10,7 +10,7 @@ module GemPublisher
         returns(data_file("gem_build"))
 
       builder = Builder.new(cli_facade)
-      assert_equal "test_gem-0.0.2.gem", builder.build("foo.gemspec")
+      assert_equal "example-0.0.3.gem", builder.build("foo.gemspec")
     end
   end
 end

data/test/common.rb

@@ -6,6 +6,10 @@ require "mocha"
 
 class MiniTest::Unit::TestCase
   def data_file(name)
-    File.read(File.expand_path("../data/#{name}", __FILE__))
+    File.read(data_file_path(name))
+  end
+
+  def data_file_path(name)
+    File.expand_path("../data/#{name}", __FILE__)
   end
 end

data/test/data/example.gemspec

@@ -0,0 +1,12 @@
+gemspec = Gem::Specification.new do |s|
+  s.name              = 'example'
+  s.version           = '0.0.3'
+  s.summary           = 'summary'
+  s.description       = 'description'
+  s.files             = Dir.glob("{lib,test}/**/*")
+  s.require_path      = 'lib'
+  s.has_rdoc          = true
+  s.homepage          = 'http://example.com'
+  s.authors           = ['Luther Blisset']
+  s.email             = 'user@example.com'
+end

data/test/data/gem_build

@@ -1,4 +1,4 @@
   Successfully built RubyGem
-  Name: test_gem
-  Version: 0.0.2
-  File: test_gem-0.0.2.gem
+  Name: example
+  Version: 0.0.3
+  File: example-0.0.3.gem

data/test/integration_test.rb

@@ -14,13 +14,14 @@ module GemPublisher
     end
 
     def test_should_build_and_tag_and_publish
+      gemspec = data_file_path("example.gemspec")
       expect_cli "git ls-remote --tags origin", data_file("tags")
-      expect_cli "gem build example.gemspec", data_file("gem_build")
-      expect_cli "gem push test_gem-0.0.2.gem"
+      expect_cli "gem build #{gemspec}", data_file("gem_build")
+      expect_cli "gem push example-0.0.3.gem"
       expect_cli "git rev-parse HEAD", "1234abcd"
-      expect_cli "git update-ref refs/tags/v1.0.0 1234abcd"
-      expect_cli "git push origin tag v1.0.0"
-      GemPublisher.publish_if_updated "example.gemspec", "1.0.0"
+      expect_cli "git update-ref refs/tags/v0.0.3 1234abcd"
+      expect_cli "git push origin tag v0.0.3"
+      GemPublisher.publish_if_updated gemspec
     end
   end
 end

data/test/{gem_publisher_test.rb → publisher_test.rb}

@@ -4,22 +4,23 @@ require "gem_publisher/publisher"
 module GemPublisher
   class PublisherTest < MiniTest::Unit::TestCase
     def test_should_not_do_anything_and_return_nil_if_version_has_not_changed
-      p = Publisher.new("foo.gemspec", "0.0.2")
+      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])
+      p.git_remote.stubs(:tags).returns(%w[v0.0.1 v0.0.2 v0.0.3])
       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
-      p = Publisher.new("foo.gemspec", "0.0.3")
+      gemspec = data_file_path("example.gemspec")
+      p = Publisher.new(gemspec)
       p.builder = mock
       p.builder.expects(:build).
-        with("foo.gemspec").
+        with(gemspec).
         returns("foo-0.0.3.gem")
       p.pusher = mock
       p.pusher.expects(:push).with("foo-0.0.3.gem", :method)
@@ -30,7 +31,7 @@ module GemPublisher
     end
 
     def test_should_build_and_tag_and_publish_and_return_gem_name_if_there_is_no_released_version
-      p = Publisher.new("foo.gemspec", "0.0.3")
+      p = Publisher.new(data_file_path("example.gemspec"))
       p.builder = mock
       p.builder.expects(:build).returns("foo-0.0.3.gem")
       p.pusher = mock

metadata

@@ -2,7 +2,7 @@
 name: gem_publisher
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors: 
 - Paul Battley
@@ -51,12 +51,13 @@ files:
 - lib/gem_publisher/version.rb
 - lib/gem_publisher.rb
 - test/common.rb
+- test/publisher_test.rb
 - test/git_remote_test.rb
-- test/gem_publisher_test.rb
 - test/cli_facade_test.rb
 - test/builder_test.rb
 - test/data/tags
 - test/data/gem_build
+- test/data/example.gemspec
 - test/integration_test.rb
 homepage: http://github.com/alphagov/gem_publisher
 licenses: []
@@ -71,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2618561868502119280
+      hash: -2881051043129598916
       segments: 
       - 0
       version: "0"
@@ -80,7 +81,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -2618561868502119280
+      hash: -2881051043129598916
       segments: 
       - 0
       version: "0"