rake-release 0.3.1 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b765b7e4a6fa595d55c6eb83b41562b32624fce
-  data.tar.gz: 672abe5d9a19fe73061a7bdd46148222b4677b17
+  metadata.gz: 4c15844cf0ddcb1c04e6e96c6e7619549327f389
+  data.tar.gz: 488040f7a8e55d54fcbdd8a02030e6ba5ae83589
 SHA512:
-  metadata.gz: d1418a8e642439637a45a2d52514519d052bd190451962d4d94041b03529b34782a44c3914ee8a66d6ea8c40acc5e80fdc1c1ab3dcf78c790c0d9026ab13936d
-  data.tar.gz: 427aec58e984d2ed8bbba388e806077e05fab3f6869ca4ef229b24c9976384e95b7effa2d0a45a23b419a20c261aabc2aee91995a749936e0cb2f88560a66524
+  metadata.gz: 31df5bf0235d6a9c58f69b29a79d2d0f37934a016c414932d622b4739405f5a468bed692912bed509b933b4a3edae1f40750f15be188c1b0a7506d76c29fcfaf
+  data.tar.gz: ff35df37fc36b62c1f6aec9ccf1200d544d954f4a5450f567e1e31b75cd9d3448ff4e970840320890bbd8aa32ed5106fa24be5075680f6f22b890c7e9de2af30

data/lib/rake/release.rb

@@ -7,23 +7,15 @@ require 'pathname'
 module Rake
   module Release
     class << self
-      def pwd
-        @pwd ||= Pathname.new Bundler::SharedHelpers.pwd
-      end
-
-      def ui
-        @ui ||= Bundler::UI::Shell.new
-      end
-
       def autodetect!
-        specs = Spec.scan pwd.join '{*/*/,*/,}*.gemspec'
+        specs = Spec.scan Task.pwd.join '{*/*/,*/,}*.gemspec'
         specs.uniq! {|spec| spec.name }
 
         if specs.size == 1
-          Task.new specs.first
+          Rake::Release::Task.new specs.first
         else
           specs.each do |spec|
-            Task.new spec, namespace: spec.name
+            Rake::Release::Task.new spec, namespace: spec.name
           end
         end
       end

data/lib/rake/release/spec.rb

@@ -16,9 +16,10 @@ module Rake
       attr_reader :gemspec_path
 
       attr_accessor :namespace
+      attr_accessor :push_host
 
       def initialize(path, namespace: nil)
-        path = Release.pwd.join(path.to_s).expand_path
+        path = Task.pwd.join(path.to_s).expand_path
 
         if path.directory?
           @base = path
@@ -38,18 +39,21 @@ module Rake
         @gemspec = Bundler.load_gemspec @gemspec_path
 
         raise RuntimeError.new 'Cannot load gemspec' unless @gemspec
-      end
 
-      def push_host
-        @push_host ||= begin
-          if @gemspec.metadata['allowed_push_host'].to_s.empty?
-            @push_host = URI 'https://rubygems.org'
-          else
-            @push_host = URI @gemspec.metadata['allowed_push_host']
-          end
+        @push_host = URI 'https://rubygems.org'
+
+        unless @gemspec.metadata['allowed_push_host'].to_s.empty?
+          @push_host = URI @gemspec.metadata['allowed_push_host']
         end
       end
 
+      def push_host=(value)
+        @push_host = URI value
+      end
+
+      alias_method :host, :push_host
+      alias_method :host=, :push_host=
+
       def push_host_name
         push_host.host.to_s
       end
@@ -73,11 +77,11 @@ module Rake
       class << self
         def load(*args, &block)
           new(*args, &block)
-        rescue
+        rescue RuntimeError
           nil
         end
 
-        def scan(path = Release.pwd.join('*.gemspec'))
+        def scan(path = Task.pwd.join('*.gemspec'))
           Pathname
             .glob(path)
             .map {|path| Rake::Release::Spec.load path }

data/lib/rake/release/task.rb

@@ -15,7 +15,7 @@ module Rake
       def initialize(spec = nil, **kwargs, &block)
         @spec = spec || Rake::Release::Spec.new(**kwargs, &block)
 
-        namespace = @spec.namespace || kwargs[:namespace]
+        namespace = kwargs[:namespace] || @spec.namespace
 
         if namespace
           send(:namespace, namespace) { setup }
@@ -85,7 +85,7 @@ module Rake
         @spec.pkg_path.mkpath
         FileUtils.mv @spec.pkg_file_name, @spec.pkg_path.join(@spec.pkg_file_name)
 
-        Release.ui.confirm "#{@spec.name} #{@spec.version} built to #{@spec.pkg_path}."
+        Task.ui.confirm "#{@spec.name} #{@spec.version} built to #{@spec.pkg_path}."
       end
 
       def install(local: false)
@@ -94,7 +94,7 @@ module Rake
 
         sh! *cmd
 
-        Release.ui.confirm "#{@spec.name} (#{@spec.version}) installed."
+        Task.ui.confirm "#{@spec.name} (#{@spec.version}) installed."
       end
 
       def publish
@@ -105,7 +105,7 @@ module Rake
 
         sh! *cmd
 
-        Release.ui.confirm "Pushed #{@spec.pkg_file_name} to #{@spec.push_host}"
+        Task.ui.confirm "Pushed #{@spec.pkg_file_name} to #{@spec.push_host}"
       end
 
       def git_clean
@@ -127,11 +127,11 @@ module Rake
       def tag_version
         sh! 'git', 'tag', '-a', '-m', "Version #{@spec.version}", @spec.version_tag
 
-        Release.ui.confirm "Tagged #{@spec.version_tag}."
+        Task.ui.confirm "Tagged #{@spec.version_tag}."
 
         yield if block_given?
       rescue
-        Release.ui.error "Untagging #{@spec.version_tag} due to error."
+        Task.ui.error "Untagging #{@spec.version_tag} due to error."
 
         sh! 'git', 'tag', '-d', @spec.version_tag
 
@@ -145,7 +145,7 @@ module Rake
           return false
         end
 
-        Release.ui.confirm "Tag #{@spec.version_tag} has already been created."
+        Task.ui.confirm "Tag #{@spec.version_tag} has already been created."
 
         true
       end
@@ -160,7 +160,7 @@ module Rake
         sh! *cmd
         sh! *cmd, '--tags'
 
-        Release.ui.confirm 'Pushed git commits and tags.'
+        Task.ui.confirm 'Pushed git commits and tags.'
       end
 
       def publish?
@@ -185,7 +185,7 @@ module Rake
       def sh(*cmd, chdir: @spec.base, raise_error: true, &block)
         cmd = cmd.flatten.map(&:to_s)
 
-        Release.ui.debug cmd
+        Task.ui.debug cmd
 
         Open3.popen2(*cmd, chdir: chdir) do |stdin, out, t|
           stdin.close
@@ -197,15 +197,31 @@ module Rake
       end
 
       class << self
-        def load_all(dir = Release.pwd)
-          specs = Spec.scan dir
+        def load_all(dir = self.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
 
+          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 }
         end
+
+        def pwd
+          @pwd ||= Pathname.new Bundler::SharedHelpers.pwd
+        end
+
+        def ui
+          @ui ||= Bundler::UI::Shell.new
+        end
       end
     end
   end

data/rake-release.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |spec|
   spec.name          = 'rake-release'
-  spec.version       = '0.3.1'
+  spec.version       = '0.4.0'
   spec.authors       = ['Jan Graichen']
   spec.email         = ['jgraichen@altimos.de']
   spec.licenses      = ['MIT']

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rake-release
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
 platform: ruby
 authors:
 - Jan Graichen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-21 00:00:00.000000000 Z
+date: 2016-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler