deploy-context 2.1.31.1.g6ccfd57 → 2.1.32.15.g7b29619

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4790347be42e7ed73a93b9251302192eb6e366b2c2ba28ae5f0557c29b2e05
-  data.tar.gz: 63bf3d0cbc0f753992c8b000157a0d38b29da843c800cdbf5f957bd57e4f98d8
+  metadata.gz: d27bbe5efafcb1a1684532ee7c1fbe7e57cf9084de387dbf0410f8a722b053a6
+  data.tar.gz: f87858265a221249dc821dc3e82bc32ebfc13130bbfd6ddb921e431602660b0f
 SHA512:
-  metadata.gz: f13c41adfb0f3136e8e175262df30c732aca0601091dddb60fa567941eeaf36dafad3545f8ee1ace19696338cb15395694af410aa926ad6358336467df098e71
-  data.tar.gz: 323dba5bbc3dd41875c85519ef79c9b3cb81dab4de8c1bb7e7db030f4e8adf97bff90298f8b09a7edde478f745f59db7327ef99890055eec2f44aec2847630f1
+  metadata.gz: 51c5f18a1584b97cf3fe4c923629b6a57f306bc81d5fb4e10d6d376f052f8013ac1a25a7aafa42e58a14b20d7dc2160a069a1de3f9730f4c3ac02470e69513b2
+  data.tar.gz: 6d0203968751a87a77f42a46b0db253a801b55958e99cf34bcd956158e272d11f05058d479a59b829d812f8b436c45c94487f606de2e97bc623c6bc52e66d15f

data/Rakefile

@@ -13,18 +13,4 @@ end
 
 require 'git-version-bump/rake-tasks'
 
-require_relative 'lib/deploy-context'
-
-deployer = Context::DeployContext.deployer
-
-task :default do
-  deployer.execute_action(deployer, 'once')
-end
-
-task :bump do
-  deployer.execute_action(deployer, 'bump')
-end
-
-task :test do
-  deployer.execute_action(deployer, 'test')
-end
+require_relative 'lib/deploy-context/helpers/rake'

data/bin/deploy-context

@@ -1,2 +1,2 @@
 #!/usr/bin/env ruby
-require 'deploy-context/context/binary'
+require 'deploy-context/helpers/binary'

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

@@ -1,9 +1,11 @@
 module Context
-  module CucumberDeployerHelper
-    def cucumber_test(context)
-      git_build(context)
-      puts "Working in folder #{Dir.pwd}\nAnd context #{context.context_name} is created in folder #{context.context_folder} at version #{context.version}"
-      cucumber
+  module DeployHelpers
+    module CucumberHelper
+      def cucumber_test(context)
+        context.git_build(context)
+        context.log "Working in folder #{Dir.pwd}\nAnd context #{context.context_name} is created in folder #{context.context_folder} at version #{context.version}"
+        context.cucumber(context)
+      end
     end
   end
 end

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

@@ -0,0 +1,87 @@
+module Context
+  module DeployHelpers
+    module DeployerHelper
+      def get_context_folder(context, folder)
+        File.join(context.context_folder, folder)
+      end
+
+      def build_folder(context)
+        context.get_context_folder(context, 'build')
+      end
+    
+      def contexts_container(context)
+        context.get_context_folder(context, 'contexts')
+      end
+      
+      def chef_exec(context, commands)
+        context.execute_command(%w(chef exec) + commands)
+      end
+      
+      def git(context, commands)
+        context.chef_exec(context,['git'] + commands)
+      end
+      
+      def gem(context, commands)
+        context.chef_exec(context,['gem'] + commands)
+      end
+      
+      def rake(context, commands)
+        context.chef_exec(context,['rake'] + commands)
+      end
+      
+      def cucumber(context, commands = [])
+        context.chef_exec(context,['cucumber'] + commands)
+      end
+
+      def execute_action(context, action)
+        state_action = if action.nil?
+          context.cycle
+          false
+        else
+          case action
+          when 'once'
+            context.log "\nExecute only once\n"
+            context.cycle
+            true
+          when 'always'
+            context.log "\nAlways in execution\n"
+            while true do
+              context.cycle
+            end
+            true
+          when 'bump'
+            context.log "\nBump minor version\n"
+            context.patch_bump
+            true
+          when 'release'
+            context.log "\nBump major version\n"
+            context.minor_bump
+            true
+          when 'upgrade'
+            context.log "\nBump major version\n"
+            context.major_bump
+            true
+          when 'test'
+            context.log "\nExecute tests\n"
+            context.cucumber_test(context)
+            true
+          when 'reset'
+            context.log "\nReset versionning\n"
+            system('rake')
+            # context.cucumber_test(deployer)
+            true
+          else
+            context.log "Unknown setting #{action}"
+            false
+          end
+        end
+        context.commit
+        if state_action
+          context.log "Action #{action} executed correctly in context #{context}"
+        else
+          context.abort("Failed to execute action #{action} in context #{context}")
+        end
+      end
+    end
+  end
+end

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

@@ -1,53 +1,55 @@
 module Context
-  module GitDeployerHelper
-    def git_build(context)
-      if context.present_localy?
-        Dir.chdir(context.context_folder)
-        git_pull(context)
-      else
-        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)
+  module DeployHelpers
+    module GitHelper
+      def git_build(context)
+        if context.present_localy?
+          Dir.chdir(context.context_folder)
+          context.git_pull(context)
+        else
+          local_dir = File.join(Dir.pwd, context.context_name)
+          context.git ["clone git@github.com:JimboDragonGit/#{context.context_name}.git"] unless ::Dir.exist?(local_dir)
+          context.move_folder(local_dir)
+        end
       end
-    end
 
-    def git_pull(context)
-      git_build(context) unless context.actual_working_directory?
-      git ['pull']
-    end
+      def git_pull(context)
+        context.git_build(context) unless context.actual_working_directory?
+        context.git context, ['pull']
+      end
 
-    def git_commit(context)
-      git_build(context)
-      git ['add .']
-      git ["commit -m 'Create #{context.context_name} automatic commit'"]
-    end
+      def git_commit(context)
+        context.git_build(context)
+        context.git context, ['add .']
+        context.git context, ["commit -m 'Create #{context.context_name} automatic commit'"]
+      end
 
-    def git_release(context)
-      git_build(context)
-      git ['push', '--follow-tags']
-    end
+      def git_release(context)
+        context.git_build(context)
+        context.git context, ['push', '--follow-tags']
+      end
 
-    def git_bump(context, level)
-      git_build(context)
-      git ['version-bump', level]
-      git_commit(context)
-    end
+      def git_bump(context, level)
+        context.git_build(context)
+        context.git context, ['version-bump', level]
+        context.git_commit(context)
+      end
 
-    def patch_reset(context)
-      git_build(context)
-      git_bump(context, 'minor')
-    end
+      def patch_reset(context)
+        context.git_build(context)
+        context.git_bump(context, 'minor')
+      end
 
-    def git_update_available?(context)
-      git_build(context)
-      # git ['log', "v#{context.version}"]
-      git ['ls-remote origin', "v#{context.version}"]
-    end
+      def git_update_available?(context)
+        context.git_build(context)
+        # context.git ['log', "v#{context.version}"]
+        context.git context, ['ls-remote origin', "v#{context.version}"]
+      end
 
-    def git_dirty_state?(context)
-      git_build(context)
-      # git ['log', "v#{context.version}"]
-      `git status --porcelain`.split('\n').count > 0
+      def git_dirty_state?(context)
+        context.git_build(context)
+        # context.git ['log', "v#{context.version}"]
+        context.get_data(["git status --porcelain"]).split('\n').count > 0
+      end
     end
   end
 end

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

@@ -1,74 +1,81 @@
 require 'rubygems'
 
 module Context
-  module RubyDeployerHelper
-    def ruby_build(context)
-      git_build(context)
-      puts "Working in folder #{Dir.pwd}\nAnd context #{context.context_name} is created"
-      check_folder get_context_folder(context, 'build')
-    end
+  module DeployHelpers
+    module RubyHelper
+      def ruby_build(context)
+        git_build(context)
+        context.log "Working in folder #{Dir.pwd}\nAnd context #{context.context_name} is created"
+        check_folder get_context_folder(context, 'build')
+      end
 
-    def ruby_release(context)
-      git_build(context)
-      # gem ["push #{context.context_name}-#{GVB.version}.gem"]
-      # context.patch_bump if gem_installed?(context)
-      rake ['release']
-      # context.commit
-    end
+      def ruby_release(context)
+        context.git_build(context)
+        # gem ["push #{context.context_name}-#{GVB.version}.gem"]
+        # context.patch_bump if gem_installed?(context)
+        context.rake context, ['release']
+        # context.commit
+      end
 
-    def ruby_install(context)
-      gem ['install', context.context_name]
-    end
+      def ruby_install(context)
+        context.gem context, ['install', context.context_name]
+      end
 
-    def clean_folder(context, folder)
-      clean_folder = get_context_folder(context, folder)
-      puts "Clean folder #{clean_folder}"
-      FileUtils.remove_dir(clean_folder) if Dir.exist?(clean_folder)
-    end
+      def clean_folder(context, folder)
+        clean_folder = get_context_folder(context, folder)
+        puts "Clean folder #{clean_folder}"
+        FileUtils.remove_dir(clean_folder) if Dir.exist?(clean_folder)
+      end
 
-    def ruby_clean(context)
-      clean_folder(context, 'pkg')
-    end
+      def ruby_clean(context)
+        clean_folder(context, 'pkg')
+      end
 
-    def ruby_remove_gem(context)
-      clean_folder(context, 'pkg')
-    end
+      def ruby_remove_gem(context)
+        clean_folder(context, 'pkg')
+      end
 
-    def ruby_check_if_available_public(context)
-      puts "Waiting a minute before installing #{context.context_name} in folder #{context.context_folder}"
-      `chef gem list #{context.context_name}`
-      # sleep(60)
-    end
+      def ruby_check_if_available_public(context)
+        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} in folder #{context.context_folder}"
-      installed = installed_version == context.version
-      puts "installed = #{installed}"
-      installed
-    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} in folder #{context.context_folder}"
+        installed = installed_version == context.version
+        puts "installed = #{installed}"
+        installed
+      end
 
-    def ruby_cycle(context)
-      if context.new_update_available?
-        context.clean
-        if git_dirty_state?(context)
-          context.patch_bump
-          context.commit
-        end
-        context.build
-        # context.commit
-        context.release
-        context.wait_until_release_available
-        context.install
-        if context.test_context_successful?
-          puts "newer version installed successfully for #{context.context_name} on version #{context.version}"
-          # context.patch_bump
-          # patch_reset(context)
+      def ruby_cycle(context)
+        context.log "\n\nBuilding Ruby application for #{context.context_name}"
+        if context.new_update_available?
+          context.log "\n\nNew update available for #{context.context_name}\nCleaning the building space"
+          context.clean
+          if git_dirty_state?(context)
+            context.patch_bump
+            context.commit
+          end
+          context.log "\n\nBuilding project #{context.context_name} now ..."
+          context.build
+          # context.commit
+          context.log "\n\nReleasing project #{context.context_name}"
+          context.release
+          context.wait_until_release_available
+          context.log "\n\nInstalling project #{context.context_name}"
+          context.install
+          if context.test_context_successful?
+            context.log "newer version installed successfully for #{context.context_name} on version #{context.version}"
+            # context.patch_bump
+            # patch_reset(context)
+          else
+            context.log "newer version not installed for #{context.context_name} on version #{context.version}"
+          end
         else
-          puts "newer version not installed for #{context.context_name} on version #{context.version}"
+          context.log "No update available"
         end
-      else
-        puts "No update available"
       end
     end
   end

data/lib/deploy-context/deploy.rb

@@ -1,8 +1,13 @@
-require_relative 'context/deploy'
+require_relative 'helpers/command'
+require_relative 'deploy/deployer'
+require_relative 'deploy/git'
+
 
 module Context
   class Deploy
-    include DeployHelper
+    include CommandHelper
+    include DeployHelpers::DeployerHelper
+    include DeployHelpers::GitHelper
 
     attr_reader :context_name
     attr_reader :context_folder
@@ -30,7 +35,7 @@ module Context
 
     def version
       git_build(self)
-      puts "Getting version info for #{context_folder} and version should be #{GitVersionBump.version(true)}"
+      log "Getting version info for #{context_folder} and version should be #{GitVersionBump.version(true)}"
       Gem::Version.new(GitVersionBump.version(true))
     end
 
@@ -39,7 +44,7 @@ module Context
     end
 
     def test_context_successful?
-      puts "Check if #{context_name} is install #{version}"
+      log "Check if #{context_name} is install #{version}"
       if gem_installed?(self)
         puts "Test context #{context_name} was successfully install on version #{version}"
         true
@@ -58,6 +63,7 @@ module Context
     end
 
     def release
+      debug_log "Release #{context_name} at version #{version}"
       ruby_release(self)
       git_release(self)
     end
@@ -71,16 +77,23 @@ module Context
       ruby_clean(self)
     end
 
+    def show_new_version(level)
+      log "#{level} bump #{context_name} at newer version #{version}"
+    end
+
     def patch_bump
       GitVersionBump.tag_version("#{GitVersionBump.major_version(true)}.#{GitVersionBump.minor_version(true)}.#{GitVersionBump.patch_version(true) + 1}")
+      show_new_version('Patch')
     end
 
     def minor_bump
       GitVersionBump.tag_version("#{GitVersionBump.major_version(true)}.#{GitVersionBump.minor_version(true) + 1}.0")
+      show_new_version('Minor')
     end
 
     def major_bump
       GitVersionBump.tag_version("#{GitVersionBump.major_version(true) + 1}.0.0")
+      show_new_version('Major')
     end
 
     def wait_until_release_available

data/lib/deploy-context/helpers/command.rb

@@ -0,0 +1,51 @@
+module Context
+  module CommandHelper
+    def debug?
+      ENV.key?('CONTEXTDEBUG') && ! ENV['CONTEXTDEBUG'].nil? && ENV['CONTEXTDEBUG']
+      true
+    end
+
+    def log(message)
+      puts message
+    end
+
+    def debug_log(message)
+      log message if debug?
+    end
+
+    def is_admin?
+      Process::Sys.getuid != 0
+    end
+
+    def temp_dir
+      @temp_dir = Dir.tmpdir() if @temp_dir.nil?
+      @temp_dir
+    end
+
+    def get_data(command_line)
+      debug_log "Get data from command #{command_line.join(' ')}"
+      `#{command_line.join(' ')}`
+    end
+
+    def execute_command(command)
+      command_status = system(command.join(' '))
+      debug_log "executed command #{command.join(' ')}"
+      command_status
+    end
+
+    def sudo_command(command)
+      if ! Gem.win_platform? && Process::Sys.getuid != 0
+        ['sudo'] + command
+      else
+        command
+      end
+    end
+
+    def write_in_system_file(file, content)
+      debug_log "write_in_system_file #{[file, content]}"
+      system("touch #{file}")
+      ::File.write(file, content)
+      system("chmod 644 #{file}") unless Gem.win_platform?
+    end
+  end
+end

data/lib/deploy-context/helpers/rake.rb

@@ -0,0 +1,15 @@
+require_relative '../../deploy-context'
+
+deployer = Context::DeployContext.deployer
+
+task :default => "test" do
+  deployer.execute_action(deployer, 'once')
+end
+
+task :bump do
+  deployer.execute_action(deployer, 'bump')
+end
+
+task :test do
+  deployer.execute_action(deployer, 'test')
+end

data/lib/deploy-context.rb

@@ -3,15 +3,13 @@ require 'fileutils'
 require 'git-version-bump'
 
 require_relative 'deploy-context/deploy'
-require_relative 'deploy-context/deploy/git'
 require_relative 'deploy-context/deploy/ruby'
 require_relative 'deploy-context/deploy/cucumber'
 
 module Context
   class DeployContext < Deploy
-    include GitDeployerHelper
-    include RubyDeployerHelper
-    include CucumberDeployerHelper
+    include DeployHelpers::RubyHelper
+    include DeployHelpers::CucumberHelper
 
     def self.deployer
       @deployer = Context::DeployContext.new(Dir.pwd) if @deployer.nil?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deploy-context
 version: !ruby/object:Gem::Version
-  version: 2.1.31.1.g6ccfd57
+  version: 2.1.32.15.g7b29619
 platform: ruby
 authors:
 - Jimmy Provencher
@@ -35,7 +35,7 @@ cert_chain:
   +V3ectLBpuoKM8f/ZFMnUPA0mAv5e7J6u9IBwyNj/cy+wLOAbpPdmhoKZXCpQcno
   ysBBJbi//0tgFWwC4vOaDMch
   -----END CERTIFICATE-----
-date: 2023-10-03 00:00:00.000000000 Z
+date: 2023-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -106,12 +106,14 @@ files:
 - features/update_deployer.feature
 - features/updated_git.feature
 - lib/deploy-context.rb
-- lib/deploy-context/context/binary.rb
-- lib/deploy-context/context/deploy.rb
 - lib/deploy-context/deploy.rb
 - lib/deploy-context/deploy/cucumber.rb
+- lib/deploy-context/deploy/deployer.rb
 - lib/deploy-context/deploy/git.rb
 - lib/deploy-context/deploy/ruby.rb
+- lib/deploy-context/helpers/binary.rb
+- lib/deploy-context/helpers/command.rb
+- lib/deploy-context/helpers/rake.rb
 homepage: https://github.com/JimboDragonGit/deploy-context
 licenses:
 - MIT

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

@@ -1,85 +0,0 @@
-module Context
-  module DeployHelper
-    def get_context_folder(context, folder)
-      File.join(context.context_folder, folder)
-    end
-
-    def build_folder(context)
-      get_context_folder(context, 'build')
-    end
-  
-    def contexts_container(context)
-      get_context_folder(context, 'contexts')
-    end
-    
-    def chef_exec(commands)
-      system("chef exec #{commands.join(' ')}")
-    end
-    
-    def git(commands)
-      chef_exec(['git'] + commands)
-    end
-    
-    def gem(commands)
-      chef_exec(['gem'] + commands)
-    end
-    
-    def rake(commands)
-      chef_exec(['rake'] + commands)
-    end
-    
-    def cucumber(commands = [])
-      chef_exec(['cucumber'] + commands)
-    end
-
-    def execute_action(context, action)
-      state_action = if action.nil?
-        context.cycle
-        false
-      else
-        case action
-        when 'once'
-          puts "\nExecute only once\n"
-          context.cycle
-          true
-        when 'always'
-          puts "\nAlways in execution\n"
-          while true do
-            context.cycle
-          end
-          true
-        when 'bump'
-          puts "\nBump minor version\n"
-          context.patch_bump
-          true
-        when 'release'
-          puts "\nBump major version\n"
-          context.minor_bump
-          true
-        when 'upgrade'
-          puts "\nBump major version\n"
-          context.major_bump
-          true
-        when 'test'
-          puts "\nExecute tests\n"
-          context.cucumber_test(context)
-          true
-        when 'reset'
-          puts "\nReset versionning\n"
-          system('rake')
-          # context.cucumber_test(deployer)
-          true
-        else
-          puts "Unknown setting #{action}"
-          false
-        end
-      end
-      context.commit
-      if state_action
-        puts "Action #{action} executed correctly in context #{context}"
-      else
-        abort("Failed to execute action #{action} in context #{context}")
-      end
-    end
-  end
-end