kitchen-yansible 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4416424c143f371bb9a09f4a072dc06f8445ee90dc08ad75e4189c3805ef4abb
-  data.tar.gz: 4f0cbde92dcd94e3a2acb9072d89668c646ce122833d79f57790bd5edeef798f
+  metadata.gz: f3042f87171f0711d2879002115c0b61f235c28a75ecec3ca504832d0cada06e
+  data.tar.gz: 3c74feaede09b76cd984c486dc5c6b44828dfb5d10094a7034f5b0832c2edac4
 SHA512:
-  metadata.gz: fa8709f257d27ec5af58216a8e036fc776dbf9e9a5b2d112b8d2c472644a8ce9e68e81282c0ff586fc13f25d6267669d6c6a536b6ad3e2c6120a50bf6a47690e
-  data.tar.gz: 27f6c33a53aebc7886e02f5a650ff294fe02d6838d6008a2f72c0fa32ee83e7d26208f4516489f0e3c26d9e8abbfccb3bc0abeab7c26eb32b7d55bf937e1d197
+  metadata.gz: ba5b5367db8ab1aa7d322e6022ad2c2d0438066d2e2af552232f022fb1d4cae08245a7ab9949d406c351ee555ecd2f32dbb9ea558cc2e6eb61920e82307a39b0
+  data.tar.gz: 42be482cffb962b3f7ed0b93fc5dd03784951b99227c09c5a0ac7b1e08d135314764464b5d8ae1b2064bad2b816180936141f42f81fc8a4b875cb7156769a92c

data/kitchen-yansible.gemspec

@@ -56,5 +56,4 @@ Gem::Specification.new do |s|
 EOF
 
   s.add_runtime_dependency      'test-kitchen', '~> 2.0'
-  s.add_runtime_dependency      'rugged',       '~> 0.25'
 end

data/lib/kitchen-yansible/tools/dependencies.rb

@@ -18,15 +18,34 @@
 # specific language governing permissions and limitations
 # under the License.
 
-require 'rugged'
-
 module Kitchen
   module Yansible
     module Tools
       module Dependencies
         def git_clone(name, url, path)
           info("Cloning '#{name}' Git repository.")
-          Rugged::Repository.clone_at(url, path, { :ignore_cert_errors => true })
+          execute_local_command("git clone --progress --verbose #{url} #{path}")
+        end
+
+        def git_get_origin(path)
+          debug("Get '#{path}' origin.")
+          execute_local_command( 'git remote get-url origin', opts: { :chdir => path }, return_stdout: true )
+        end
+
+        def git_clean(path)
+          debug("Cleaning up '#{path}' origin.")
+          execute_local_command('git clean -fdx', opts: { :chdir => path })
+          execute_local_command('git reset --hard', opts: { :chdir => path })
+        end
+
+        def git_checkout(path, ref, force: false)
+          debug("Checking out #{ref} on #{path}.")
+          execute_local_command("git checkout #{ref}#{force ? ' -f' : ''}", opts: { :chdir => path })
+        end
+
+        def git_check_ref(path, ref)
+          debug("Checking out #{ref} on #{path}.")
+          execute_local_command("git show-ref #{ref}", opts: { :chdir => path })
         end
 
         def prepare_dependencies(dependencies)
@@ -44,40 +63,52 @@ module Kitchen
             if dependency.key?(:repo)
               if dependency[:repo].downcase == 'git'
                 info('Processing as Git repository.')
-                begin
-                  repo = Rugged::Repository.new(dependency_target_path)
-                  if repo.remotes.first.url.eql?(dependency[:url])
-                    warn("Dependency cloned already.")
+                if command_exists('git')
+                  if File.exist?(dependency_target_path)
+                    if execute_local_command('git status .', opts: { :chdir => dependency_target_path })
+                      if git_get_origin(dependency_target_path).chomp.eql?(dependency[:url])
+                        warn("Dependency downloaded already, resetting to HEAD.")
+                        git_clean(dependency_target_path)
+                      else
+                        warn("Removing directory #{dependency_target_path} due to repository origin difference.")
+                        FileUtils.remove_entry_secure(dependency_target_path)
+                        git_clone(dependency[:name], dependency[:url], dependency_target_path)
+                      end
+                    else
+                      warn("Dependency path '#{dependency_target_path}' is not a valid Git repository. Removing then.")
+                      FileUtils.remove_entry_secure(dependency_target_path)
+                      git_clone(dependency[:name], dependency[:url], dependency_target_path)
+                    end
                   else
-                    warn("Removing directory #{dependency_target_path} due to repository origin difference.")
-                    FileUtils.remove_entry_secure(dependency_target_path)
                     git_clone(dependency[:name], dependency[:url], dependency_target_path)
                   end
-                rescue
-                  if File.exist?(dependency_target_path)
-                    warn("Dependency path '#{dependency_target_path}' is not a valid Git repository. Removing then.")
-                    FileUtils.remove_entry_secure(dependency_target_path)
+
+                  raw_ref = dependency.key?(:ref) ? dependency[:ref] : 'master'
+                  begin
+                    git_check_ref(dependency_target_path, raw_ref)
+                  rescue
+                    message = unindent(<<-MSG)
+
+                      ===============================================================================
+                       Invalid Git reference - #{raw_ref}
+                       Please check '#{dependency[:name]}' dependency configuration.
+                      ===============================================================================
+                    MSG
+                    raise UserError, message
                   end
-                  repo = git_clone(dependency[:name], dependency[:url], dependency_target_path)
-                end
 
-                raw_ref = dependency.key?(:ref) ? dependency[:ref] : 'master'
-                begin
-                  repo.rev_parse(raw_ref)
-                rescue
+                  info("Resetting repository to '#{raw_ref}' reference.")
+                  git_checkout(dependency_target_path, raw_ref, force: true)
+                else
                   message = unindent(<<-MSG)
 
                     ===============================================================================
-                     Invalid Git reference - #{raw_ref}
-                     Please check '#{dependency[:name]}' dependency configuration.
+                     Couldn't find git binary.
+                     Please make sure execution host has Git binaries installed.
                     ===============================================================================
                   MSG
                   raise UserError, message
                 end
-
-                info("Resetting '#{dependency[:name]}' repository to '#{raw_ref}' reference.")
-                repo.checkout(raw_ref, {:strategy => :force})
-                repo.close
               else
                 raise UserError, "Working with '#{dependency[:repo]}' repository is not implemented yet."
               end

data/lib/kitchen-yansible/version.rb

@@ -20,6 +20,6 @@
 
 module Kitchen
   module Yansible
-    VERSION = '0.0.3'.freeze
+    VERSION = '0.0.4'.freeze
   end
 end

data/lib/kitchen/provisioner/yansible.rb

@@ -236,8 +236,8 @@ module Kitchen
         @command_args = []
         @config[:ansible_extra_arguments].each { |arg| @command_args.push(arg) } if @config[:ansible_extra_arguments]
         @config[:ansible_verbose] ? @command_args.push('-' + 'v' * @config[:ansible_verbosity]) : ''
-        @command_args.push("--inventory=#{remote_file_path(ANSIBLE_INVENTORY, fallback: inventory_file)}")
-        @command_args.push("--limit=#{@instance.name}")
+        @command_args.push("--inventory='#{remote_file_path(ANSIBLE_INVENTORY, fallback: inventory_file)}'")
+        @command_args.push("--limit='#{@instance.name}'")
         @command_args.push(remote_file_path(@config[:playbook]))
 
         @command_args

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-yansible
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Eugene Akhmetkhanov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-03-01 00:00:00.000000000 Z
+date: 2021-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -24,20 +24,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: rugged
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.25'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.25'
 description: |+
   = Yet Another Ansible Test Kitchen Provisioner
   ---
@@ -96,8 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.7.7
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Yet Another Ansible Test-Kitchen Provisioner