release-gem 0.1.7 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dea9d324f7b793ed225472a24d957dcd38eabb8f713271d2cb524a6f1e5f1923
-  data.tar.gz: 6581b5e4fa0d949871b87392e97f139f30785791d93a6fa040260ba52ab312d3
+  metadata.gz: 5c0211c8dd1084dd65167ca184ca17d66d05dc7a63d4385e1a35965b0699d8b7
+  data.tar.gz: b2855a26a1efac3bff15429d15f9abbc6f22cb63b8743466e4d8ecea1687030d
 SHA512:
-  metadata.gz: 970ea9b05c234620c01a03193e2a92a1c485e0019ac381ba87b3e09c0a82b6d6ba2e8abd80d911d6250e995d1fc36435000ce4f9491f3c1628b474ec78489c1f
-  data.tar.gz: e45f427d07988e498c13cbcf7cc95eacde6523f5e2551ea7e098f9ad6062f60b7039e24800e0c79f8da3b7010c909d5c517273f28d4d69cdc2b4aa639700feda
+  metadata.gz: 2e8738c91ae9148ee43d81bdd345eeb12e2d2b5d1de7a275173cd038196bcaac1e2cd6f6beff184994b03e83d7733e8e644615f70265cd37e537d8f736412244
+  data.tar.gz: 0c666a33f97bea158bed117243d901d1385d3065c62edaabc3c7df7306962d1bd1b92ca3e729265e5fafb4f6cc27e43d1cf978095c46683d4838ab10c1d70cd5

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    release-gem (0.1.7)
+    release-gem (0.1.9)
       colorize
       git_cli
       gvcs

data/lib/release/gem/gem_action.rb

@@ -63,7 +63,9 @@ module Release
                 end
               end
 
+              Gem.logger.debug "About to transfer gem"
               gemdepInst.transfer_gem
+              Gem.logger.debug "GEM transfer!"
 
               block.call(:development_gem_temporary_promoted)
             end
@@ -124,6 +126,8 @@ module Release
             if $?
               cp "Gem build successfully at #{Gem.format_dt(Time.now)}"
 
+              register(:version_file_path, verfile)
+
               if block
                 block.call(:gem_build_successfully, @selVersion)
               else

data/lib/release/gem/gemdep.rb

@@ -65,7 +65,7 @@ module Release
         remove_dev_gem_from_gemfile
         add_gem_to_gemspec(@gemConfig)
 
-      end
+      end # transfer_gem
 
       def all_dev_gems_has_config?
         not_configured_gem.length == 0   
@@ -76,6 +76,7 @@ module Release
       end
 
       def restore_dev_gem
+        Gem.logger.debug "restore_dev_gem : #{@fileHistory.inspect}"
         @fileHistory.each do |k,v|
           FileUtils.mv(k,"#{k}.prod")
           FileUtils.cp(v,k)
@@ -89,6 +90,9 @@ module Release
         ri.trigger_release_gem(&block)
       end
 
+      #### 
+      # Private section
+      ####
       private
       def remove_dev_gem_from_gemfile
         if has_development_gem?

data/lib/release/gem/vcs_action.rb

@@ -66,7 +66,7 @@ module Release
               # block should call vcs for remove, ignore and diff
               res = block.call(:select_files_to_manage, { modified: { files: modFiles, dirs: modDir }, new: { files: newFiles, dirs: newDir }, deleted: { files: delFiles, dirs: delDir }, staged: { files: stgFiles, dirs: stgDir }, vcs: self } )
 
-              break if res == :done
+              break if not res.is_a?(GitCli::Delta::VCSItem) and res == :done
 
             end
 
@@ -290,6 +290,30 @@ module Release
           @ws.add_to_staging(*files) 
         end
 
+        def add_to_staging_if_commit_before(*files)
+
+          stgDir, stgFiles = @ws.staged_files
+          modDir, modFiles = @ws.modified_files
+          #newDir, newFiles = @ws.new_files
+          delDir, delFiles = @ws.deleted_files
+
+          mFiles = modFiles.map { |e| e.path }
+          sFiles = stgFiles.map { |e| e.path }
+          dFiles = delFiles.map { |e| e.path }
+
+          res = []
+          files.each do |f|
+            if (mFiles.include?(f) or dFiles.include?(f)) and not sFiles.include?(f)
+              res << f
+            end
+          end
+
+          if not_empty?(res)
+            @ws.add_to_staging(*res)
+          end
+
+        end
+
         def ignore(*files)
           @ws.ignore(*files) 
         end

data/lib/release/gem/vcs_cli_action.rb

@@ -54,19 +54,21 @@ module Release
 
                 end
 
-                if sel != :done
+                if sel.is_a?(GitCli::Delta::VCSItem)
 
-                  selOps = @prmt.select pmsg("\n What do you want to do with file '#{sel}'?") do |m|
+                  selOps = @prmt.select pmsg("\n What do you want to do with file '#{sel.path}'?") do |m|
 
-                    m.choice "Diff", :diff 
+                    m.choice "Diff", :diff  if not (sel.is_a?(GitCli::Delta::NewFile) or sel.is_a?(GitCli::Delta::NewDir)) 
                     m.choice "Ignore", :ignore
                     m.choice "Remove from staging", :remove_from_staging if sel.is_a?(GitCli::Delta::StagedFile)
+                    m.choice "Delete", :delete if (sel.is_a?(GitCli::Delta::NewFile) or sel.is_a?(GitCli::Delta::NewDir)) 
                     m.choice "Done", :done
                   end
 
                   case selOps
                   when :diff
-                    puts @inst.diff_file(sel.path)
+                    st, res = @inst.diff_file(sel.path)
+                    puts res
                     STDIN.getc
                   when :ignore
                     confirm = @prmt.yes?(pmsg("\n Add file '#{sel.path}' to gitignore file?"))
@@ -78,6 +80,11 @@ module Release
                     if confirm
                       @inst.remove_from_staging(sel.path)
                     end
+                  when :delete
+                    skip = @prmt.no?(pmsg("\n Delete the file '#{sel.path}' from file system? NOTE THIS CANNOT BE UNDONE! "))
+                    if not skip
+                      FileUtils.rm(sel.path)
+                    end
                   when :done
                   end
 
@@ -120,7 +127,7 @@ module Release
 
                 @prmt.puts ""
 
-                sel = @prmt.multi_select pmsg("\n Following are new files that could be added to version control : ") do |m|
+                sel = @prmt.multi_select pmsg("\n Following are new files that could be added to version control.\n Don't worry if you found not all changed files are here. There will be another commit session after the build : ") do |m|
 
                   mfiles[:new].each do |k,v|
                     v.each do |vv|

data/lib/release/gem/version.rb

@@ -2,6 +2,6 @@
 
 module Release
   module Gem
-    VERSION = "0.1.7"
+    VERSION = "0.1.9"
   end
 end

data/templates/standard_cli_flow.rb

@@ -11,42 +11,40 @@ Release::Gem.engine(:gem, root: Dir.getwd) do
     run_test(:rspec) 
 
     # to allow user to get a view on what's changed
+    # and allow user to ignore or remove file from staging
     vcs_cli_overview_changes
 
-    gem_cli_action do
+    # Reason to put it here is because gem build shall
+    # only consider files already inside git system via
+    # git ls-files command. Anything new that is not yet
+    # check in will not be packup by the gem build process
+    vcs_cli_commit
 
-      # step 2 : check dependency
-      release_dependencies 
+    # step 2 : check dependency
+    gem_cli_release_dependencies 
 
-      vcs_cli_commit_new_files
+    # step 3 : build the gem
+    st, ver = gem_cli_build
 
-      # step 3 : build the gem
-      st, ver = build
+    gem_cli_dependency_restore
 
-      dependency_restore
+    if st
+      # step 4, push the gem to rubygems
+      gem_cli_push(version: ver)
+      gem_cli_install(version: ver)
+    end
 
-      if st
-        # step 4, push the gem to rubygems
-        push(version: ver)
-        install(version: ver)
-      end
+    vcs_add_to_staging_if_commit_before("Gemfile.lock")
+    vcs_add_to_staging(value(:version_file_path))
 
-    end # gem_cli_action
+    vcs_commit("Commit after gem version #{ver} built")
 
+    # step 7 : tag the source code
+    vcs_cli_tag( tag: ver )      
 
-    vcs_cli_action do
-      @selVer = value(:selected_version)
+    # step 8 : Push the source code
+    vcs_cli_push
 
-      # step 6 : commit vcs
-      commit
-
-      # step 7 : tag the source code
-      tag( tag: @selVer )      
-
-      # step 8 : Push the source code
-      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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: release-gem
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.9
 platform: ruby
 authors:
 - Chris