release-gem 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b9ddcff2d96fbd26c5b35922f9b5b7e3f80b3f85ef7fd384218454f021ba0634
-  data.tar.gz: cd3a8dc5754bbc3e31e6aba9e9cb78137e7e59d330aac18d773bb540f3874545
+  metadata.gz: 25dd9ae22ee2f6e81080fb7dfad95726cf299aa4c8e437ea49ccf015ba383566
+  data.tar.gz: f3f0f229c66f3eb7e3c9aa2cbf275a0cbaed4f55da0987c17bddcde48bfb8890
 SHA512:
-  metadata.gz: d62bb46846ae308e74740a8f5197454ae77cdf46882afa053f7ca3dd8b750024b5373fd1f544dd716d34f20ad89caa4ec43cd948369185f64f8b6f77af9bc196
-  data.tar.gz: c850c5f366feca6ab4f15e0f472498019005d826cb97b8ebba2d47605752c2c0c335eafc9f7f7f2b2c9716ee9e981670f4998caa181e674ee9c1e48e6218c420
+  metadata.gz: e892d6126c332f5266abaf1c3bb992c4cd4f9157eac46da023f4eff89b9a1217e69fed6656c24447fe903d707d2803c86241290b65f0aada86e06985faa8ee33
+  data.tar.gz: 2142260e3f9bc6af01c6bc6e3812b9258e8ec077dbb44d77f77243989b722ed9306fe8f6d2a467043d5681acf37fb193004b504815cef932552307e82cee3831

data/Gemfile

@@ -9,6 +9,4 @@ gem "rake", "~> 13.0"
 
 gem "rspec", "~> 3.0"
 
-gem "gvcs", git: "gvcs", branch: "master"
-gem "git_cli", git: "git_cli", branch: "master"
 

data/Gemfile.lock

@@ -1,26 +1,10 @@
-GIT
-  remote: git_cli
-  revision: 05d83d28f37f4023920b6bf91d975b818d0f13fe
-  branch: master
-  specs:
-    git_cli (0.11.2)
-      gvcs
-      ptools (~> 1.4.0)
-      teLogger
-      toolrack
-
-GIT
-  remote: gvcs
-  revision: 698970026596bdff48e475c92387287b5966dd1e
-  branch: master
-  specs:
-    gvcs (0.1.1)
-
 PATH
   remote: .
   specs:
-    release-gem (0.1.2)
+    release-gem (0.1.4)
       colorize
+      git_cli
+      gvcs
       teLogger
       toolrack
       tty-command
@@ -31,6 +15,12 @@ GEM
   specs:
     colorize (0.8.1)
     diff-lcs (1.5.0)
+    git_cli (0.11.2)
+      gvcs
+      ptools (~> 1.4.0)
+      teLogger
+      toolrack
+    gvcs (0.1.1)
     pastel (0.8.0)
       tty-color (~> 0.5)
     ptools (1.4.3)
@@ -68,8 +58,6 @@ PLATFORMS
   x86_64-linux
 
 DEPENDENCIES
-  git_cli!
-  gvcs!
   rake (~> 13.0)
   release-gem!
   rspec (~> 3.0)

data/lib/release/gem/gem_action.rb

@@ -3,6 +3,7 @@
 require "bundler/gem_tasks"
 require "rspec/core/rake_task"
 require 'yaml'
+require_relative 'gemdep'
 
 module Release
   module Gem
@@ -28,8 +29,48 @@ module Release
           instance_eval(&block) if block
         end
 
-        def release_dependencies
-          puts "gem release dependencies" 
+        def release_dependencies(*args, &block)
+
+          if gemdepInst.has_development_gem?
+
+            if block
+
+              block.call(:action_start, :relase_dependencies)
+              keys = gemdepInst.development_gem.keys
+              loop do
+                begin
+                  conf = block.call(:define_gem_prod_config, { gems: keys })
+                  if conf.is_a?(Hash)
+                    conf.each do |k,v|
+                      gemdepInst.configure_gem(k,v)
+                    end
+                    break if gemdepInst.all_dev_gems_has_config? 
+                    keys = gemdepInst.not_configured_gem
+                  else
+                    block.call(:invalid_gem_prod_config, "Expected return from :define_gem_prod_config is a hash of \"gem name\" => { type: [:runtime | :dev], version: \">= 1.2.0\" }. Note version can be empty")
+                  end
+                rescue GemDepError => ex
+                  block.call(:invlid_gem_prod_config, ex.message)
+                end
+              end
+
+              gemdepInst.transfer_gem
+
+              block.call(:development_gem_temporary_promoted)
+            end
+
+          else
+            if block
+              block.call(:no_development_gems_found)
+            end
+
+          end
+
+        end
+
+        def dependency_restore
+          puts "restoring dependency"
+          gemdepInst.restore_dev_gem 
         end
 
         def build(*args, &block)
@@ -288,6 +329,13 @@ module Release
           end
         end
 
+        def gemdepInst
+          if @gemdepInst.nil?
+            @gemdepInst = GemDep.new(@root)
+          end
+          @gemdepInst
+        end
+
 
       end
     end

data/lib/release/gem/gem_cli_action.rb

@@ -19,8 +19,53 @@ module Release
         end
 
         def release_dependencies
-          puts "CLI release dependencies"
-          @inst.release_dependencies
+          @inst.release_dependencies do |ops, *args|
+            case ops
+            when :action_start
+              @pmt.say "\n Release dependencies starting...\n".yellow
+
+            when :define_gem_prod_config
+
+              config = {}
+              selections = args.first[:gems]
+
+              loop do
+
+                sel = @pmt.select("\n The following development gems requires configuration. Please select one to configure ".yellow) do |m|
+                  selections.each do |g|
+                    m.choice g, g
+                  end
+                end
+
+                config[sel] = {} if config[sel].nil?
+
+                type = @pmt.select("\n The gem in production will be runtime or development ? ".yellow) do |m|
+                  m.choice "Runtime", :runtime
+                  m.choice "Development only", :dev
+                end
+
+                config[sel][:type] = type
+
+                ver = @pmt.ask("\n Is there specific version pattern (including the ~>/>/>=/= of gemspec) for the gem in production? (Not mandatory) : ".yellow)
+                config[sel][:version] = ver if not_empty?(ver)
+
+                @pmt.puts " ** Done configure for gem #{sel}".yellow
+                selections.delete_if { |v| v == sel }
+                break if selections.length == 0
+
+              end
+
+              config
+
+            when :development_gem_temporary_promoted
+              @pmt.puts "\n Development gem(s) temporary promoted to production status".yellow
+
+            when :no_development_gems_found
+              @pmt.puts "\n No development gem(s) in used found".yellow
+
+            end
+          end
+
         end
 
         def build(*pargs, &block)

data/lib/release/gem/gemdep.rb

@@ -0,0 +1,171 @@
+
+require 'bundler'
+
+module Release
+  module Gem
+    
+    class GemDepError < StandardError; end
+
+    class GemDep
+      include TR::CondUtils
+
+      def initialize(root, opts = {  })
+        @root = root
+        @devGems = {}
+        @gemConfig = {}
+        @fileHistory = {}
+        load_gemfile_deps
+        load_gemspec_deps
+      end
+
+      def load_gemfile_deps
+        gdef = Bundler::Definition.build(gemfile_file, nil, {})
+        gdef.dependencies.each do |d|
+          if not d.source.nil? and d.source.path.to_s != "."
+            @devGems[d.name] = d.source.path.to_s
+          end
+        end
+      end
+
+      def load_gemspec_deps
+        gs = ::Gem::Specification.load(gemspec_file)
+        gs.dependencies.each do |d|
+          if not d.source.nil? and d.source.path.to_s != "."
+            @devGems[d.name] = d.source.path.to_s
+          end
+        end
+      end
+
+      def has_development_gem?
+        not_empty?(@devGems)
+      end
+
+      def development_gem
+        @devGems
+      end
+
+      def configure_gem(name, opts = { type: :runtime, version: "" })
+        raise GemDepError, "Given option to configure the gem is empty" if is_empty?(opts)
+        raise GemDepError, "Given option is not a hash. Hash wity keys :type and/or :version (can be empty) is expected" if not opts.is_a?(Hash)
+        raise GemDepError, "Production gem type not given. Please provide the gem type via key :type (valid value is either :runtime or :dev)" if is_empty?(opts[:type])
+
+        if @devGems.keys.include?(name.to_s) 
+          @gemConfig[name.to_s] = opts
+        else
+          raise GemDepError, "Name '#{name}' is not in the list of development gems. Valid value including : #{@devGems.keys.join(", ")}"
+        end
+      end
+
+      def transfer_gem
+        if not all_dev_gems_has_config?
+          raise GemDepError, "Not all gem has configuration. Gem required configuration includes: #{not_configured_gem.join(", ")}"
+        end
+
+        remove_dev_gem_from_gemfile
+        add_gem_to_gemspec(@gemConfig)
+
+      end
+
+      def all_dev_gems_has_config?
+        not_configured_gem.length == 0   
+      end
+
+      def not_configured_gem
+        @devGems.keys.difference(@gemConfig.keys)
+      end
+
+      def restore_dev_gem
+        @fileHistory.each do |k,v|
+          FileUtils.mv(k,"#{k}.prod")
+          FileUtils.cp(v,k)
+        end
+        @fileHistory.clear
+      end
+
+      private
+      def remove_dev_gem_from_gemfile
+        if has_development_gem?
+          orin = gemfile_file
+          dest = "#{gemfile_file}.dev"
+          FileUtils.cp(orin, dest)
+          @fileHistory[orin] = dest
+
+          tmpOut = "#{orin}.tmp"
+
+          File.open(tmpOut, "w") do |f|
+            cont = File.read(dest)
+            cont.each_line do |l|
+              next if l =~ /^gem ('|")(#{development_gem.keys.join("|")})('|")/
+              f.puts l
+            end
+          end
+
+          FileUtils.rm(orin)
+          FileUtils.mv(tmpOut, orin)
+
+          # to make sure has_development_gem? return false in subsequent run
+          load_gemfile_deps
+
+        end
+      end
+
+      def add_gem_to_gemspec(spec = {})
+
+        if has_development_gem?
+
+          orin = gemspec_file
+          dest = "#{gemspec_file}.dev"
+          FileUtils.cp(orin, dest)
+          @fileHistory[orin] = dest
+
+          tmpOut = "#{orin}.tmp"
+
+          cont = File.read(gemspec_file) 
+          lastEnd = cont.rindex("end")
+          
+          File.open(tmpOut, "w") do |f|
+            f.write cont[0...lastEnd]
+            spec.each do |k,v|
+              case v[:type]
+              when :runtime
+                f.puts "  spec.add_dependency \"#{k}\"#{is_empty?(v[:version]) ? "" : ", \"#{v[:version]}\""}"
+              when :dev
+                f.puts "  spec.add_development_dependency \"#{k}\"#{is_empty?(v[:version]) ? "" : ", \"#{v[:version]}\""}"
+              end
+            end
+
+            f.puts "end"
+          end
+
+          FileUtils.rm(orin)
+          FileUtils.mv(tmpOut, orin)
+          
+          # to make sure has_development_gem? return false in subsequent run
+          load_gemspec_deps
+
+        end
+
+
+      end
+
+      def gemspec_file
+        if @_gemspec.nil?
+          @_gemspec = Dir.glob(File.join(@root,"*.gemspec"))  
+          raise GemDepError, "Cannot find gemspec at '#{@root}'" if is_empty?(@_gemspec)
+          @_gemspec = @_gemspec.first
+        end
+        @_gemspec
+      end
+
+      def gemfile_file
+        if @_gemfile_file.nil?
+          @_gemfile_file = Dir.glob(File.join(@root,"Gemfile"))
+          raise GemDepError, "Cannot find Gemfile at '#{@root}'" if is_empty?(@_gemfile_file)
+          @_gemfile_file = @_gemfile_file.first
+        end
+        @_gemfile_file
+      end
+
+    end
+  end
+end

data/lib/release/gem/version.rb

@@ -2,6 +2,6 @@
 
 module Release
   module Gem
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

data/tasks/standard.rake

@@ -38,6 +38,12 @@ namespace :gem do
     end
   end
 
+  #desc "Release test"
+  #task :test_release do
+  #  stdFlow = File.join(File.dirname(__FILE__),"..","templates","standard_flow")
+  #  require stdFlow
+  #end
+
   desc "Copy the standard flow to project local so modification of the flow is possible"
   task :customize_flow do
     stdFlow = File.join(File.dirname(__FILE__),"..","templates","standard_cli_flow.rb")

data/templates/standard_cli_flow.rb

@@ -4,20 +4,22 @@ require 'release/gem'
 
 puts "\n Standard GEM CLI release flow version #{Release::Gem::VERSION}\n".yellow
 
-begin
-
-  Release::Gem.engine(:gem, root: Dir.getwd) do
+Release::Gem.engine(:gem, root: Dir.getwd) do
 
+  begin
     # step 1 : run test
     run_test(:rspec) 
 
     gem_cli_action do
 
       # step 2 : check dependency
-      release_dependencies
+      release_dependencies 
 
       # step 3 : build the gem
       st, ver = build
+
+      dependency_restore
+
       if st
         # step 4, push the gem to rubygems
         push(version: ver)
@@ -26,6 +28,7 @@ begin
 
     end # gem_cli_action
 
+
     vcs_cli_action do
       @selVer = value(:selected_version)
 
@@ -39,17 +42,20 @@ begin
       push
 
     end # vcs_action block
+  rescue Release::Gem::Abort => ex
+    STDERR.puts "\n -- Aborted by user. Message was : #{ex.message}\n".red
+  rescue TTY::Reader::InputInterrupt => ex
+  rescue Exception => ex
+    STDERR.puts "\n -- Error thrown. Message was : #{ex.message}".red
+    STDERR.puts "\n#{ex.backtrace.join("\n")}" if ENV["RELGEM_DEBUG"] == true
+  ensure 
+    gem_dependency_restore
+  end
 
-  end # Release::Gem::Engine block
+end # Release::Gem::Engine block
 
-  puts "\n *** GEM standard release flow done!\n".green
+puts "\n *** GEM CLI standard release flow done!\n".green
 
-rescue Release::Gem::Abort => ex
-  STDERR.puts "\n -- Aborted by user. Message was : #{ex.message}\n".red
-rescue TTY::Reader::InputInterrupt => ex
-rescue Exception => ex
-  STDERR.puts "\n -- Error thrown. Message was : #{ex.message}".red
-end
 
 
 

data/templates/standard_flow.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env ruby
 
-require 'gem/release'
+require 'release/gem'
 
 require 'tty/prompt'
 
@@ -8,17 +8,56 @@ pmt = TTY::Prompt.new
 
 pmt.puts "\n Standard GEM release flow version #{Release::Gem::VERSION}\n".yellow
 
-begin
 
-  Release::Gem.engine(:gem, root: Dir.getwd, ui: STDOUT) do
+Release::Gem.engine(:gem, root: Dir.getwd, ui: STDOUT) do
 
+  begin
     # step 1 : run test
     run_test(:rspec) 
 
     gem_action do
 
       # step 2 : check dependency
-      release_dependencies
+      release_dependencies do |ops, *args|
+        case ops
+        when :action_start
+          pmt.say "\n Release dependencies starting...\n".yellow
+
+        when :define_gem_prod_config
+
+          config = {}
+          selections = args.first[:gems]
+
+          loop do
+
+            sel = pmt.select("\n The following development gems requires configuration. Please select one to configure") do |m|
+              selections.each do |g|
+                m.choice g, g
+              end
+            end
+
+            config[sel] = {} if config[sel].nil?
+
+            type = pmt.select("\n The gem in production will be runtime or development ? ") do |m|
+              m.choice "Runtime", :runtime
+              m.choice "Development only", :dev
+            end
+
+            config[sel][:type] = type
+
+            ver = pmt.ask("\n Is there specific version pattern (including the ~>/>/>=/= of gemspec) for the gem in production? (Not mandatory) : ")
+            config[sel][:version] = ver if not_empty?(ver)
+
+            pmt.puts " ** Done configure for gem #{sel}"
+            selections.delete_if { |v| v == sel }
+            break if selections.length == 0
+
+          end
+
+          config
+
+        end
+      end
 
       # step 3 : build the gem
       st, ver = build do |ops, *args|
@@ -199,7 +238,7 @@ begin
         end
       end
 
-      
+
       push do |ops, *args|
         case ops
         when :select_remote
@@ -244,17 +283,19 @@ begin
 
     end # vcs_action block
 
-  end # Release::Gem::Engine block
-
-  pmt.puts "\n *** GEM standard release flow done!\n".green
 
-rescue Release::Gem::Abort => ex
-  pmt.puts "\n -- Aborted by user. Message was : #{ex.message}\n".red
-rescue TTY::Reader::InputInterrupt => ex
-rescue Exception => ex
-  pmt.puts "\n -- Error thrown. Message was : #{ex.message}".red
+  rescue Release::Gem::Abort => ex
+    pmt.puts "\n -- Aborted by user. Message was : #{ex.message}\n".red
+  rescue TTY::Reader::InputInterrupt => ex
+  rescue Exception => ex
+    pmt.puts "\n -- Error thrown. Message was : #{ex.message}".red
+    pmt.puts ex.backtrace.join("\n")
+  ensure
+    gem_dependency_restore
+  end
 end
 
+pmt.puts "\n *** GEM standard release flow done!\n".green
 
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: release-gem
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Chris
@@ -80,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: gvcs
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: git_cli
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - chris@antrapol.com
@@ -97,6 +125,7 @@ files:
 - lib/release/gem/gem_action.rb
 - lib/release/gem/gem_cli_action.rb
 - lib/release/gem/gem_engine.rb
+- lib/release/gem/gemdep.rb
 - lib/release/gem/vcs_action.rb
 - lib/release/gem/vcs_cli_action.rb
 - lib/release/gem/version.rb