gem_publisher 1.3.2 → 1.4.0

data/lib/gem_publisher.rb

@@ -12,8 +12,8 @@ module GemPublisher
   # If a remote tag matching the version already exists, nothing is done.
   # Otherwise, the gem is built, pushed, and tagged.
   #
-  # Tags are expected to be of the form "v1.2.3", and generated tags follow
-  # this pattern.
+  # Tags are of the form "v1.2.3" by default, and generated tags follow
+  # this pattern; you can override this by passing in the :tag_prefix option.
   #
   # Method should be one of :rubygems or :gemfury, and the requisite
   # credentials for the corresponding push command line tools must exist.
@@ -22,6 +22,7 @@ module GemPublisher
   # CliFacade::Error will be raised if a command fails.
   #
   def self.publish_if_updated(gemspec, method=:rubygems, options={})
-    Publisher.new(gemspec).publish_if_updated(method, options)
+    publisher = Publisher.new(gemspec, tag_prefix: options.delete(:tag_prefix))
+    publisher.publish_if_updated(method, options)
   end
 end

data/lib/gem_publisher/publisher.rb

@@ -8,8 +8,11 @@ module GemPublisher
     attr_accessor :git_remote, :builder, :pusher
     attr_reader :version
 
-    def initialize(gemspec)
+    # Supported options:
+    #   :tag_prefix - use a custom prefix for Git tags (defaults to 'v')
+    def initialize(gemspec, options = {})
       @gemspec = gemspec
+      @tag_prefix = options[:tag_prefix] || 'v'
 
       @version = eval(File.read(gemspec), TOPLEVEL_BINDING).version.to_s
 
@@ -18,17 +21,22 @@ module GemPublisher
       @pusher     = Pusher.new
     end
 
+    # Publish the gem if its version has changed since the last release.
+    #
+    # Supported options:
+    #   :as - specify a shared account to publish the gem (Gemfury only)
     def publish_if_updated(method, options = {})
       return if version_released?
       @builder.build(@gemspec).tap { |gem|
+        tag_prefix = options[:tag_prefix] || 'v'
         @pusher.push gem, method, options
-        @git_remote.add_tag "v#@version"
+        @git_remote.add_tag "#{@tag_prefix}#{@version}"
       }
     end
 
     def version_released?
       releases = @git_remote.tags.
-        select { |t| t =~ /^v\d+(\.\d+)+/ }.
+        select { |t| t =~ /^#{@tag_prefix}\d+(\.\d+)+/ }.
         map { |t| t.scan(/\d+/).map(&:to_i) }
       this_release = @version.split(/\./).map(&:to_i)
       releases.include?(this_release)

data/lib/gem_publisher/pusher.rb

@@ -11,6 +11,10 @@ module GemPublisher
       "gemfury"  => %w[fury push]
     }
 
+    # Publish the gem.
+    #
+    # Supported options:
+    #   :as - specify a shared account to publish the gem (Gemfury only)
     def push(gem, method, options = {})
       push_command = PUSH_METHODS[method.to_s] or raise "Unknown Gem push method #{method.inspect}."
       push_command += [gem]

data/lib/gem_publisher/version.rb

@@ -1,3 +1,3 @@
 module GemPublisher
-  VERSION = "1.3.2"
+  VERSION = "1.4.0"
 end

data/test/publisher_test.rb

@@ -79,6 +79,18 @@ module GemPublisher
       assert_equal "foo-0.0.3.gem", p.publish_if_updated(:method)
     end
 
+    def test_should_publish_with_custom_git_tag_prefix_if_given
+      p = Publisher.new(data_file_path("example.gemspec"), :tag_prefix => "prefix")
+      p.builder = mock
+      p.builder.expects(:build).returns("foo-0.0.3.gem")
+      p.pusher = mock
+      p.pusher.expects(:push).with("foo-0.0.3.gem", :method, {})
+      p.git_remote = mock
+      p.git_remote.stubs(:tags).returns(%w[prefix0.0.1 prefix0.0.2 prefix0.1.0])
+      p.git_remote.expects(:add_tag).with("prefix0.0.3")
+      assert_equal "foo-0.0.3.gem", p.publish_if_updated(:method)
+    end
+
     ::VERSION = "0.2.3"
     def test_should_eval_gemspec_in_root_context
       # Previously this would pick up GemPublisher::VERSION incorrectly

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gem_publisher
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,27 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-24 00:00:00.000000000 Z
+date: 2014-08-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9717880 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - =
       - !ruby/object:Gem::Version
         version: 0.14.0
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.14.0
+  version_requirements: *9717880
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
+  requirement: &9717460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -37,12 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: *9717460
 description: Automatically build, tag, and push a gem when its version has been updated.
 email: pbattley@gmail.com
 executables: []
@@ -68,7 +58,8 @@ files:
 - test/integration_test.rb
 - test/git_remote_test.rb
 homepage: http://github.com/alphagov/gem_publisher
-licenses: []
+licenses:
+- MIT
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -81,7 +72,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -113103099571362151
+      hash: -4102411382457102235
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -90,10 +81,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -113103099571362151
+      hash: -4102411382457102235
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: Automatically build, tag, and push gems