dtk-common 0.10.1 → 0.10.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9b561364827cd709558e207956f79b60208c50ea
-  data.tar.gz: 72b02a1765b40e658206dddf951266498e562936
+  metadata.gz: 4240d1834319c588e8bae9375fc59825457c5611
+  data.tar.gz: db63e6764fc469d4f911dbd9a746720c33aff142
 SHA512:
-  metadata.gz: 2ab4113002e58ffa1c05407d60f70cce64dcb6c443e5866ed16a7a87a1952e545dc36ce2e3e926bc6ede53e85e0647d695a6b67871a2f22fee99f95029db63ee
-  data.tar.gz: 1a654ed9d99b59dc3337a8980000f77e0b55f5663a9154f46f1efb5ab16b27ee8a099b232afc612ecc5ae9b3e54123bc76de0dc8f06e4f858578cdf83310a348
+  metadata.gz: baf009fac4b24d1b1290b2cbdda04d7eccc2460905f419453e844cef3ce5b69b5bea6e3c9420110b019baa2e5b4c0d69138bf4cd3382f06beeeb6b445164715b
+  data.tar.gz: d4a9e3c887a8c9ba708d31ef25b90b3118f89483e010701059cff3a49b22dc28d8c7a14207fe82ae8c2ad928676465ed133bdf43799ae953f67b561d78ac4577

data/dtk-common.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'rugged','~> 0.17.0.b7'
   gem.add_dependency 'dtk-common-core','0.10.1'
   gem.add_dependency 'colorize','~> 0.5.8'
-  gem.add_dependency 'docker-api', '~> 1.26'
   gem.add_dependency 'grit', '~> 2.5'
   gem.add_dependency 'erubis', '~> 2.7'
   # gem.add_dependency 'sequel','~> 3.40.0'

data/lib/dtk-common/version.rb

@@ -16,5 +16,5 @@
 # limitations under the License.
 #
 module DtkCommon
-  VERSION="0.10.1"
+  VERSION="0.10.3"
 end

metadata

@@ -1,27 +1,27 @@
 --- !ruby/object:Gem::Specification
 name: dtk-common
 version: !ruby/object:Gem::Version
-  version: 0.10.1
+  version: 0.10.3
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-09 00:00:00.000000000 Z
+date: 2017-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.0.b7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.17.0.b7
 - !ruby/object:Gem::Dependency
@@ -42,56 +42,42 @@ dependencies:
   name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.5.8
-- !ruby/object:Gem::Dependency
-  name: docker-api
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.26'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.26'
 - !ruby/object:Gem::Dependency
   name: grit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.5'
 - !ruby/object:Gem::Dependency
   name: erubis
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.7'
 description: Dtk common is needed to use dtk-client gem, provides common libraries
@@ -102,8 +88,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .license_header
+- ".gitignore"
+- ".license_header"
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -111,7 +97,6 @@ files:
 - Rakefile
 - dtk-common.gemspec
 - lib/common_patch.rb
-- lib/docker/commander.rb
 - lib/dsl.rb
 - lib/dsl/directory_parser.rb
 - lib/dsl/directory_parser/git.rb
@@ -145,7 +130,6 @@ files:
 - lib/module_parser/module_parser.rb
 - lib/module_version.rb
 - lib/require_first.rb
-- lib/utils/open3.rb
 - rich_tests/README.md
 - rich_tests/dsl_test1.rb
 - rich_tests/dsl_test2.rb
@@ -234,17 +218,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14.1
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Common libraries used for DTK CLI client.

data/lib/docker/commander.rb

@@ -1,98 +0,0 @@
-require 'docker'
-require File.expand_path('../utils/open3.rb', File.dirname(__FILE__))
-
-module DTK
-  module Docker
-    class Commander
-
-      include Common::Open3
-
-      def initialize(docker_image, docker_command, puppet_manifest, execution_type, dockerfile, workdir = '/usr/share/dtk/docker-worker')
-        @docker_image = docker_image
-        @docker_command = docker_command
-        @dockerfile = dockerfile
-        @puppet_manifest = puppet_manifest
-        @execution_type = execution_type
-        @workdir = workdir
-
-        unless ::Docker::Image.exist?(docker_image) && !@dockerfile
-          Log.info "Getting docker image '#{docker_image}', this may take a while"
-          ::Docker::Image.create('fromImage' => docker_image)
-        end
-
-         # build required docker image if requested
-        if @dockerfile
-          Log.info "Building docker image: #{docker_image}"
-          image = ::Docker::Image.build(@dockerfile)
-          image.tag('repo' => docker_image, 'force' => true)
-        end
-      end
-
-      def run
-        # require 'debugger'; debugger
-        docker_container_name = "dtk#{Time.now.to_i}"
-        output_dir = "#{@workdir}/#{docker_container_name}"
-        output_dir_tmp = "#{output_dir}/tmp"
-        output_dir_container = "/host_volume"
-        output_file = "#{output_dir}/report.yml"
-        puppet_modules_dir = '/usr/share/dtk/puppet-modules'
-
-
-        FileUtils.mkdir_p output_dir_tmp
-        # make sure dtkyaml reporter is available to puppet
-        FileUtils.ln_sf '/usr/share/dtk/dtk-arbiter/dtkyaml', '/etc/puppet/modules/dtkyaml' unless File.exist? '/etc/puppet/modules/dtkyaml'
-        # write puppet manifest
-        File.open("#{output_dir}/manifest.pp", 'w') { |file| file.write(@puppet_manifest) }
-        # make sure r8 module is available
-        FileUtils.cp_r "/etc/puppet/modules/r8", puppet_modules_dir unless File.exist? "#{puppet_modules_dir}/r8"
-
-        docker_cli_cmd = "docker run --name #{docker_container_name} -v #{output_dir}:#{output_dir_container} -v #{output_dir}/tmp:/tmp" +
-                        ((@execution_type.eql? 'puppet') ? " -v #{puppet_modules_dir}:/etc/puppet/modules" : "") + " #{@docker_image} #{@docker_command}"
-
-        Log.info "Starting Docker container..."
-
-        docker_run_stdout, docker_run_stderr, exit_status, results = capture3_with_timeout(docker_cli_cmd)
-
-        if @execution_type.eql? 'puppet'
-          begin
-            docker_puppet_report = Hash.new
-            docker_puppet_report = YAML.load_file(output_file) if File.exist? output_file
-          rescue Exception => e
-            Log.error("Docker (puppet) report error: #{e.message}", e.backtrace)
-          end
-        end
-
-        container = ::Docker::Container.get(docker_container_name)
-
-        @results = Hash.new
-
-        @results[:puppet_report] = docker_puppet_report ||= ''
-        @results[:stdout] = docker_run_stdout
-        @results[:stderr] = docker_run_stderr
-        @results[:status] = exit_status.exitstatus
-        @results[:dynamic_attributes] = read_dynamic_attributes(output_dir_tmp)
-
-        # cleanup
-        Log.info("Deleting container and doing cleanup")
-        container.delete(:force => true)
-
-        # http://unix.stackexchange.com/a/117848
-        system("find #{output_dir} -depth -type f -exec shred -n 1 -z -u {} \\;")
-        FileUtils.rm_rf(output_dir)
-      end
-
-      def results
-        @results
-      end
-
-    private
-
-      def read_dynamic_attributes(path, identifier = 'dtk_exported_variables')
-        full_path = File.join(path, identifier)
-        return nil unless File.exists?(full_path)
-        Marshal.load(File.read(full_path))
-      end
-
-    end
-  end
-end

data/lib/utils/open3.rb

@@ -1,103 +0,0 @@
-require 'timeout'
-require 'open3'
-
-module DTK
-  module Common
-    module Open3
-
-      STREAM_TIMEOUT  = 5
-
-      # Running puppet directly on system and from ruby process has proven different. Following is set of environment variables
-      # that assures proper execution from bundler / rvm ruby
-      AGNOSTIC_PUPPET_VARS = {
-         "BUNDLE_GEMFILE" => nil,
-         "BUNDLE_BIN_PATH" => nil,
-         "RUBYOPT" => nil,
-         "rvm_" => nil,
-         "RACK_ENV" => nil,
-         "RAILS_ENV" => nil
-       }
-
-      ##
-      # Open3 method extended with timeout, more info https://gist.github.com/pasela/9392115
-      #
-
-      def capture3_with_timeout(*cmd)
-        spawn_opts = Hash === cmd.last ? cmd.pop.dup : {}
-        opts = {
-          :stdin_data => "",
-          :timeout    => @timeout || 0,
-          :signal     => :TERM,
-          :kill_after => nil,
-        }
-
-        in_r,  in_w  = IO.pipe
-        out_r, out_w = IO.pipe
-        err_r, err_w = IO.pipe
-        in_w.sync = true
-
-        spawn_opts[:in]  = in_r
-        spawn_opts[:out] = out_w
-        spawn_opts[:err] = err_w
-
-        result = {
-          :pid     => nil,
-          :status  => nil,
-          :stdout  => nil,
-          :stderr  => nil,
-          :timeout => false,
-        }
-
-        out_reader = nil
-        err_reader = nil
-        wait_thr = nil
-
-        begin
-          Timeout.timeout(opts[:timeout]) do
-            result[:pid] = spawn(AGNOSTIC_PUPPET_VARS, *cmd, spawn_opts)
-            wait_thr = Process.detach(result[:pid])
-            in_r.close
-            out_w.close
-            err_w.close
-
-            out_reader = Thread.new { out_r.read }
-            err_reader = Thread.new { err_r.read }
-
-            in_w.close
-
-            result[:status] = wait_thr.value
-          end
-        rescue Timeout::Error
-          result[:timeout] = true
-          pid = result[:pid]
-          Process.kill(opts[:signal], pid)
-          if opts[:kill_after]
-            unless wait_thr.join(opts[:kill_after])
-              Process.kill(:KILL, pid)
-            end
-          end
-        ensure
-          result[:status] = wait_thr.value if wait_thr
-          begin
-            # there is a bug where there is infinite leg on out_reader (e.g. hohup) commands
-            Timeout.timeout(STREAM_TIMEOUT) do
-              result[:stdout] = out_reader.value if out_reader
-              result[:stderr] = err_reader.value if err_reader
-            end
-          rescue Timeout::Error
-            result[:stdout] ||= ''
-            result[:stderr] ||= ''
-          end
-          out_r.close unless out_r.closed?
-          err_r.close unless err_r.closed?
-        end
-
-        result[:stdout] = result[:stdout].gsub(/\e\[([;\d]+)?m/, '') if result[:stdout]
-        result[:stderr] = result[:stderr].gsub(/\e\[([;\d]+)?m/, '') if result[:stderr]
-
-        [result[:stdout], result[:stderr], result[:status], result]
-      end
-
-    end
-  end
-end