deploy-context 2.1.26.1.gb2b5290 → 2.1.27.1.gd07a6e7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e00bd6a8b4bfae9ee957da560ff6b829f6d9129fb6b5a786830cddbd63ca56d9
-  data.tar.gz: 5ef1fb9a16a940542ad2997ff8bd758dd4a6ec3a2dcd07717eec1b2a5831d446
+  metadata.gz: 36244a54bb1d05997c9d2955b5651b9aeb60d7f0cfe01cb1c6478a1e2ffd1804
+  data.tar.gz: 623acfa3e111e59ab2a6979f5df8a2a0e7646fb9b5653dc6cbb6a88803055148
 SHA512:
-  metadata.gz: 4cd59ff3d340a01eec728194a603b91aeb029a391f458d7df0d3760b811148a257ec4cda556c702f7f0bc20093b3e37e44cb774005ace667d6f82062d18c5af6
-  data.tar.gz: 3b4ab40cac18552946cf7f1461ddb5108d986be7013b583fe7c31969a002b13c89fd112788696deabf655fdb0efb8826b69e56c58f3475b1827329284352d069
+  metadata.gz: '0878bbcb75424912d15a8c0da09ece0e7a2443ba7e93419a4b34e82d8d3aa80ef9f0a16529af4da7eaa392412f82d565501389e4d427b916632a56b5895e99ee'
+  data.tar.gz: 829ec345af8e4135bb9490a586a66c69b6703ea41d812532c8d5369d130e32ab6eeadcf747d02c942516dd0c0d1e5869b5d8f3b253e65cadc0edb05043733896

data/lib/deploy-context/deploy/cucumber.rb

@@ -2,8 +2,7 @@ module Context
   module CucumberDeployerHelper
     def cucumber_test(context)
       git_build(context)
-      Dir.chdir context.context_folder
-      puts "Working in folder #{Dir.pwd}\nAnd context #{context.context_name} is created"
+      puts "Working in folder #{Dir.pwd}\nAnd context #{context.context_name} is created in folder #{context.context_folder} at version #{context.version}"
       cucumber
     end
   end

data/lib/deploy-context/deploy/git.rb

@@ -1,39 +1,41 @@
 module Context
   module GitDeployerHelper
     def git_build(context)
-      Dir.chdir File.dirname(context.context_folder)
-      puts "Building ruby from folder #{context.context_folder}"
-      if ::Dir.exist?(context.context_folder)
+      if context.present_localy?
+        Dir.chdir(context.context_folder)
         git_pull(context)
       else
-        git ["clone git@github.com:JimboDragonGit/#{context.context_name}.git"] unless ::Dir.exist?(context.context_folder)
+        local_dir = File.join(Dir.pwd, context.context_name)
+        git ["clone git@github.com:JimboDragonGit/#{context.context_name}.git"] unless ::Dir.exist?(local_dir)
+        context.move_folder(local_dir)
       end
     end
 
     def git_pull(context)
-      Dir.chdir context.context_folder
+      git_build(context) unless context.actual_working_directory?
       git ['pull']
     end
 
     def git_commit(context)
-      Dir.chdir context.context_folder
+      git_build(context)
       git ['add .']
       git ["commit -m 'Create #{context.context_name} automatic commit'"]
     end
 
     def git_release(context)
-      Dir.chdir context.context_folder
+      git_build(context)
       git ['push', '--follow-tags']
     end
 
     def git_bump(context, level)
-      Dir.chdir context.context_folder
+      git_build(context)
       git ['version-bump', level]
+      git_commit(context)
     end
 
     def patch_reset(context)
+      git_build(context)
       git_bump(context, 'minor')
-      git_commit(context)
     end
 
     def git_update_available?(context)
@@ -43,7 +45,7 @@ module Context
     end
 
     def git_dirty_state?(context)
-      Dir.chdir(context.context_folder)
+      git_build(context)
       # git ['log', "v#{context.version}"]
       `git status --porcelain`.split('\n').count > 0
     end

data/lib/deploy-context/deploy/ruby.rb

@@ -4,13 +4,12 @@ module Context
   module RubyDeployerHelper
     def ruby_build(context)
       git_build(context)
-      Dir.chdir context.context_folder
       puts "Working in folder #{Dir.pwd}\nAnd context #{context.context_name} is created"
       check_folder get_context_folder(context, 'build')
     end
 
     def ruby_release(context)
-      Dir.chdir context.context_folder
+      git_build(context)
       # gem ["push #{context.context_name}-#{GVB.version}.gem"]
       # context.patch_bump if gem_installed?(context)
       rake ['release']
@@ -18,7 +17,6 @@ module Context
     end
 
     def ruby_install(context)
-      Dir.chdir context.context_folder
       gem ['install', context.context_name]
     end
 
@@ -37,14 +35,14 @@ module Context
     end
 
     def ruby_check_if_available_public(context)
-      puts "Waiting a minute before installing"
+      puts "Waiting a minute before installing #{context.context_name} in folder #{context.context_folder}"
       `chef gem list #{context.context_name}`
       # sleep(60)
     end
 
     def gem_installed?(context)
       installed_version = Gem::Specification.find_by_name(context.context_name).version
-      puts "Compare #{context.context_name} installed_version #{installed_version} with #{context.version}"
+      puts "Compare #{context.context_name} installed_version #{installed_version} with #{context.version} in folder #{context.context_folder}"
       installed = installed_version == context.version
       puts "installed = #{installed}"
       installed

data/lib/deploy-context/deploy.rb

@@ -9,13 +9,21 @@ module Context
 
     def initialize(context_name, deploycontext_folder)
       @context_name = context_name
-      @context_folder = deploycontext_folder.include?(context_name) ? deploycontext_folder : File.join(deploycontext_folder, context_name)
+      @context_folder = move_folder(deploycontext_folder)
     end
 
     def present_localy?
       Dir.exist?(context_folder)
     end
 
+    def actual_working_directory?
+      Dir.pwd == context_folder
+    end
+
+    def move_folder(folder)
+      @context_folder = folder.include?(context_name) ? folder : File.join(folder, context_name)
+    end
+
     def check_folder(folder)
       FileUtils.mkdir_p(context_folder) unless present_localy?
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy-context
 version: !ruby/object:Gem::Version
-  version: 2.1.26.1.gb2b5290
+  version: 2.1.27.1.gd07a6e7
 platform: ruby
 authors:
 - Jimmy Provencher