deploy-context 2.1.27 → 2.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15ce52a6c51ae7aa7541bd6c8e71273da68eaea184a3daabe384fb5282f70bdd
-  data.tar.gz: f9d9a33850f1222d6491391b6db20560cfdf3e8e00e0d220903e633f2cd2108c
+  metadata.gz: 7fb7e23859fff85e14cdc2c3bfb84b72c4ab4692401091d720f23c8e79f18a51
+  data.tar.gz: d9a0a27ad439e7e741cac646fcfd84383916aa17660286e73589b110069953bf
 SHA512:
-  metadata.gz: 415eabeceff075a96f1310faa7c9c61062ee36fefe3ebc405a671c031623d33842028cca8aa789b931791028448469853a7472810d80879d9ee8b6e45200c7c9
-  data.tar.gz: edfbf6917abe7aee8ff2c07616968fc702ec5e661997f2decc596fe1fc361b31dbe154d625ed6071041de7a2f2922c82ac2f6e13b74d8aff58529d0bffcb9da4
+  metadata.gz: 6d4e03f36374b0152acd83db781bb82b7766e16955cf6904a5acbcc5e0c627f70eda3f84f8f0b14c316c6dc995d96cbd2214ff23295e2a9cdf86eb2e829824ad
+  data.tar.gz: 61684dc2b42395d0588a5d86f9a0dc86aadfba729955c40b476825426164945e4a73f230f23c26d8f468398df6907446b01804e67cd23f3434b7a231ed805b9e

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.27
+  version: 2.1.28
 platform: ruby
 authors:
 - Jimmy Provencher