rake-release 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c15844cf0ddcb1c04e6e96c6e7619549327f389
-  data.tar.gz: 488040f7a8e55d54fcbdd8a02030e6ba5ae83589
+  metadata.gz: 5d71af4dc22e9d24faa21d2c014075e491f9b704
+  data.tar.gz: b74cab41e7cba25aea3ef6a1a04d2a42dd79d66e
 SHA512:
-  metadata.gz: 31df5bf0235d6a9c58f69b29a79d2d0f37934a016c414932d622b4739405f5a468bed692912bed509b933b4a3edae1f40750f15be188c1b0a7506d76c29fcfaf
-  data.tar.gz: ff35df37fc36b62c1f6aec9ccf1200d544d954f4a5450f567e1e31b75cd9d3448ff4e970840320890bbd8aa32ed5106fa24be5075680f6f22b890c7e9de2af30
+  metadata.gz: dc2b0a6c8f89dbb0a04d61da0f261e8d0e2b4745b127c6536e38b46ced6534edf5c0782c2933e7eb1a6f7191406b44b4382e1ac9ce91437936e01e87ad958a90
+  data.tar.gz: 5f423e6a51c53cf189550aeaa7918f68dfdddba4a172d3db201b4e84428c171099aec131f31782db84d76ed29ea0b16af512ec0517f4f87983768082c1226c61

data/lib/rake/release.rb

@@ -9,7 +9,7 @@ module Rake
     class << self
       def autodetect!
         specs = Spec.scan Task.pwd.join '{*/*/,*/,}*.gemspec'
-        specs.uniq! {|spec| spec.name }
+        specs.uniq!(&:name)
 
         if specs.size == 1
           Rake::Release::Task.new specs.first

data/lib/rake/release/spec.rb

@@ -16,7 +16,7 @@ module Rake
       attr_reader :gemspec_path
 
       attr_accessor :namespace
-      attr_accessor :push_host
+      attr_accessor :version_tag
 
       def initialize(path, namespace: nil)
         path = Task.pwd.join(path.to_s).expand_path
@@ -26,9 +26,7 @@ module Rake
 
           gemspecs = Dir[@base.join('*.gemspec')]
 
-          if gemspecs.size != 1
-            raise 'Unable to determine gemspec file.'
-          end
+          raise 'Unable to determine gemspec file.' if gemspecs.size != 1
 
           @gemspec_path = Pathname.new gemspecs.first
         else
@@ -40,10 +38,18 @@ module Rake
 
         raise RuntimeError.new 'Cannot load gemspec' unless @gemspec
 
-        @push_host = URI 'https://rubygems.org'
+        if @gemspec.metadata.fetch('allowed_push_host', nil)
+          @allowed_push_host = URI @gemspec.metadata['allowed_push_host']
+        end
+
+        @version_tag = true
+      end
 
-        unless @gemspec.metadata['allowed_push_host'].to_s.empty?
-          @push_host = URI @gemspec.metadata['allowed_push_host']
+      def push_host
+        if @allowed_push_host
+          @allowed_push_host
+        else
+          @push_host ||= URI 'https://rubygems.org'
         end
       end
 
@@ -51,8 +57,8 @@ module Rake
         @push_host = URI value
       end
 
-      alias_method :host, :push_host
-      alias_method :host=, :push_host=
+      alias host push_host
+      alias host= push_host=
 
       def push_host_name
         push_host.host.to_s
@@ -70,8 +76,18 @@ module Rake
         @pkg_file_path ||= pkg_path.join pkg_file_name
       end
 
+      def version_tag?
+        @version_tag ? true : false
+      end
+
       def version_tag
-        "v#{version}"
+        if @version_tag.respond_to? :call
+          @version_tag.call(self).to_s
+        elsif @version_tag.respond_to? :to_str
+          @version_tag.to_str
+        else
+          "v#{version}"
+        end
       end
 
       class << self
@@ -84,8 +100,8 @@ module Rake
         def scan(path = Task.pwd.join('*.gemspec'))
           Pathname
             .glob(path)
-            .map {|path| Rake::Release::Spec.load path }
-            .reject {|spec| spec.nil? }
+            .map { |path| Rake::Release::Spec.load path }
+            .reject(&:nil?)
         end
       end
     end

data/lib/rake/release/task.rb

@@ -42,9 +42,15 @@ module Rake
         EOF
         task('install:local' => [:build]) { install local: true }
 
-        desc <<-EOF.strip
-          Create and push tag #{@spec.version_tag}, build gem and publish to #{@spec.push_host_name}.
-        EOF
+        desc ''.tap { |str|
+          str << if @spec.version_tag?
+                   "Create and push tag #{@spec.version_tag}, build"
+                 else
+                   'Build'
+                 end
+
+          str << "and publish to #{@spec.push_host_name}."
+        }
         task :release, [:remote] => %w(build release:push release:publish)
 
         task 'release:guard:clean' do
@@ -52,11 +58,13 @@ module Rake
         end
 
         task 'release:guard:tag' do
-          guard_tag
+          guard_tag if @spec.version_tag?
         end
 
         task 'release:push', [:remote] => %w(release:guard:clean) do |_, args|
-          tag_version { git_push(args[:remote]) } unless already_tagged?
+          if @spec.version_tag? && !already_tagged?
+            tag_version { git_push(args[:remote]) }
+          end
         end
 
         task 'release:publish' => %w(release:guard:tag) do
@@ -72,7 +80,7 @@ module Rake
       def guard_tag
         out, ret = sh! 'git', 'tag', '--points-at', 'HEAD'
 
-        if not out.split("\n").include? @spec.version_tag
+        unless out.split("\n").include? @spec.version_tag
           raise "Tag #{@spec.version_tag} does not point to current HEAD. Cannot release wrong code."
         end
       end
@@ -109,7 +117,7 @@ module Rake
       end
 
       def git_clean
-        clean? && committed? || raise("There are files that need to be committed first.")
+        clean? && committed? || raise('There are files that need to be committed first.')
       end
 
       def clean?
@@ -141,9 +149,7 @@ module Rake
       def already_tagged?
         out, ret = sh 'git', 'tag'
 
-        unless out.split(/\n/).include? @spec.version_tag
-          return false
-        end
+        return false unless out.split(/\n/).include? @spec.version_tag
 
         Task.ui.confirm "Tag #{@spec.version_tag} has already been created."
 
@@ -153,9 +159,7 @@ module Rake
       def git_push(remote)
         cmd = %w(git push --quiet)
 
-        if not remote.to_s.empty?
-          cmd << remote
-        end
+        cmd << remote unless remote.to_s.empty?
 
         sh! *cmd
         sh! *cmd, '--tags'
@@ -164,7 +168,7 @@ module Rake
       end
 
       def publish?
-        ! %w(n no nil false off 0).include?(ENV["gem_push"].to_s.downcase)
+        ! %w(n no nil false off 0).include?(ENV['gem_push'].to_s.downcase)
       end
 
       def sh!(*cmd, **kwargs, &block)
@@ -182,7 +186,7 @@ module Rake
         [out, ret]
       end
 
-      def sh(*cmd, chdir: @spec.base, raise_error: true, &block)
+      def sh(*cmd, chdir: @spec.base, raise_error: true)
         cmd = cmd.flatten.map(&:to_s)
 
         Task.ui.debug cmd
@@ -197,22 +201,17 @@ module Rake
       end
 
       class << self
-        def load_all(dir = self.pwd)
+        def load_all(dir = pwd)
           specs = Spec.scan dir.join('**/*.gemspec')
 
-          if specs.size > 1
-            specs.each {|spec| spec.namespace = spec.name }
-          end
-
-          if block_given?
-            specs.each(&Proc.new)
-          end
+          specs.each { |spec| spec.namespace = spec.name } if specs.size > 1
+          specs.each(&Proc.new) if block_given?
 
-          if specs.uniq {|s| s.namespace.to_s.strip }.size != specs.size
+          if specs.uniq { |s| s.namespace.to_s.strip }.size != specs.size
             raise RuntimeError.new 'Non distinct release task namespaces'
           end
 
-          specs.each {|spec| Task.new spec }
+          specs.each { |spec| Task.new spec }
         end
 
         def pwd

data/rake-release.gemspec

@@ -2,13 +2,13 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'rake-release'
-  spec.version       = '0.4.0'
+  spec.version       = '0.5.0'
   spec.authors       = ['Jan Graichen']
   spec.email         = ['jgraichen@altimos.de']
   spec.licenses      = ['MIT']
 
-  spec.summary       = %q{Configurable fork of bundlers release tasks.}
-  spec.description   = %q{Configurable fork of bundlers release tasks.}
+  spec.summary       = 'Configurable fork of bundlers release tasks.'
+  spec.description   = 'Configurable fork of bundlers release tasks.'
   spec.homepage      = 'https://github.com/jgraichen/rake-release'
 
   spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }

data/scripts/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
-require "bundler/setup"
-require "rake/release"
+require 'bundler/setup'
+require 'rake/release'
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.
@@ -10,5 +10,5 @@ require "rake/release"
 # require "pry"
 # Pry.start
 
-require "irb"
+require 'irb'
 IRB.start

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-release
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2016-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Configurable fork of bundlers release tasks.