rundock 0.2.11 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a1c20f68b7352582d6a023f09191b0b5723053c5
-  data.tar.gz: bc343ba950dfa57b08a54c114d5b98ac1c24c260
+  metadata.gz: ee97ce7e9fab113c27e6782b3dc5a541b77fd6d7
+  data.tar.gz: c449097d5bb33e5fa09be5d00b69bf9e37a74d01
 SHA512:
-  metadata.gz: d491b7147454a26d66ccc92de7d020b86bcc2a24977c149230de511afbf17361a58ee9cfa1c1b851e27c571b8102250a2c33caef53a789c8abf954d73521a1fc
-  data.tar.gz: 954dd9a0c274019ea80e424831076b062ee7ee9927c635916f46de986337a77685a5b8762d6e1d5895f98f88b1b215d29bc3ca76dd063b93c76a3ecb4cec768c
+  metadata.gz: c096af8d1d925c6902ec72358b22d821e216dbb410981cb5d6fcacd363dbdd0730b543c6fcb0eb68a75c6bcd1636157f44fbb71687fdfe82883d35da62f2273d
+  data.tar.gz: 9b9cab0135ffc8b2d710a3fdbd6b8a39d479d7339c28f3a14780256066ecda90e7346b3274d6a681dbac8fcfc208d4c6251a01428c1f80d0526a79fa325c5609

data/.rubocop.yml

@@ -19,7 +19,7 @@ Metrics/MethodLength:
 
 Metrics/AbcSize:
   Enabled: true
-  Max: 50
+  Max: 100
 
 Metrics/CyclomaticComplexity:
   Max: 20

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## v0.3.0
+
+Improvements
+
+- Support local to Remote deploy operation
+
+Fix
+
+- Fix rundock ssh with -g option was failed because not considered nodeinfo completion
+
 ## v0.2.11
 
 Fix

data/Rakefile

@@ -81,7 +81,7 @@ end
 desc 'Cleaning environments'
 
 task :clean do
-  execute('rm -f /var/tmp/hello_rundock*', false)
+  execute('rm -fr /var/tmp/hello_rundock*', false)
   Dir.glob('./spec/integration/platforms/*').each do |platform|
     next if platform =~ /localhost$/
     execute("#{platform}/setup.sh --clean", false)

data/lib/rundock/backend.rb

@@ -32,6 +32,17 @@ module Rundock
         end
       end
 
+      def send_file(from, to)
+        system("test -d #{from}")
+        recursive = $?.to_i == 0
+
+        if !recursive
+          @backend.send_file(from, to)
+        else
+          @backend.send_directory(from, to)
+        end
+      end
+
       private
 
       def run_command(cmd, exec_options = {})

data/lib/rundock/builder/operation_builder.rb

@@ -29,7 +29,7 @@ module Rundock
               scen.node_info[v.to_sym] = node_attribute.nodeinfo = builder.parsed_options
 
               if @options[:command]
-                node.add_operation(build_cli_command_operation(@options[:command], @options))
+                node.add_operation(build_cli_command_operation(@options[:command], node_attribute, @options))
               end
             else
 
@@ -64,7 +64,8 @@ module Rundock
         @options[:host].split(',').each do |host|
           backend = BackendBuilder.new(@options, host, nil).build
           node = Node.new(host, backend)
-          node.add_operation(build_cli_command_operation(@options[:command], @options))
+          node.add_operation(
+            build_cli_command_operation(@options[:command], Rundock::Attribute::NodeAttribute.new, @options))
           scen.nodes.push(node)
         end
 
@@ -73,8 +74,7 @@ module Rundock
 
       private
 
-      def build_cli_command_operation(command, cli_options)
-        node_attributes = Rundock::Attribute::NodeAttribute.new
+      def build_cli_command_operation(command, node_attributes, cli_options)
         node_attributes.errexit = !cli_options[:run_anyway]
         Rundock::OperationFactory.instance(:command).create(Array(command), node_attributes.list)
       end

data/lib/rundock/plugin/operation/deploy.rb

@@ -0,0 +1,40 @@
+require 'rundock/operation/base'
+
+module Rundock
+  module Operation
+    # You can use this as following scenario.yml for example.
+    #
+    # - node: localhost
+    #  deploy:
+    #    - src: /tmp/deploy_from_local_file
+    #      dst: /tmp/deploy_dest_local_file
+    #    - src: /tmp/deploy_from_local_dir
+    #      dst: /tmp/deploy_dest_local_dir
+    # - node: anyhost-01
+    #  deploy:
+    #    - src: /tmp/deploy_from_local_file
+    #      dst: /tmp/deploy_dest_remote_file
+    #    - src: /tmp/deploy_from_local_dir
+    #      dst: /tmp/deploy_dest_remote_dir
+    # ---
+    # anyhost-01:
+    #   host: 192.168.1.11
+    #   ssh_opts:
+    #     port: 22
+    #     user: anyuser
+    #     key:  ~/.ssh/id_rsa
+    # ---
+    class Deploy < Base
+      def run(backend, attributes)
+        options = attributes[:deploy]
+
+        options.each do |path|
+          Logger.error('src: options not found.') if !path[:src] || path[:src].blank?
+          Logger.error('dst: options not found.') if !path[:dst] || path[:dst].blank?
+          Logger.info("deploy localhost:#{path[:src]} remote:#{attributes[:nodeinfo][:host]}:#{path[:dst]}")
+          backend.send_file(path[:src], path[:dst])
+        end
+      end
+    end
+  end
+end

data/lib/rundock/version.rb

@@ -1,3 +1,3 @@
 module Rundock
-  VERSION = '0.2.11'
+  VERSION = '0.3.0'
 end

data/spec/integration/platforms/centos6/setup.sh

@@ -23,14 +23,14 @@ RUNDOCK_SCENARIO_CACHE_DIR="${RUNDOCK_CACHE_DIR}/scenarios"
 RUNDOCK_GROUP_CACHE_DIR="${RUNDOCK_CACHE_DIR}/groups"
 
 if [ "${1}x" = "--cleanx" ];then
+  rm -f ${RUNDOCK_DEFAULT_SSH_YML}
+  rm -f ${RUNDOCK_SCENARIO_CACHE_DIR}/*.yml
+  rm -f ${RUNDOCK_GROUP_CACHE_DIR}/*.yml
   if sudo docker ps | grep "${DOCKER_IMAGE_NAME}" > /dev/null; then
-    rm -f "/var/tmp/hello_rundock*"
-    rm -f "${RUNDOCK_SCENARIO_CACHE_DIR}/*.yml"
-    rm -f "${RUNDOCK_GROUP_CACHE_DIR}/*.yml"
-    rm -f "${DOCKER_CACHE_IMAGE_PATH}"
-    rm -f "${DOCKER_SSH_KEY_PRIVATE}"
-    rm -f "${DOCKER_SSH_KEY_PUBLIC_LOCAL}"
-    rm -f "${DOCKER_SSH_CONFIG}"
+    rm -f ${DOCKER_CACHE_IMAGE_PATH}
+    rm -f ${DOCKER_SSH_KEY_PRIVATE}
+    rm -f ${DOCKER_SSH_KEY_PUBLIC_LOCAL}
+    rm -f ${DOCKER_SSH_CONFIG}
     rm -f ${DOCKER_SSH_KEY_PUBLIC_REMOTE}
     set +x
     sudo docker ps -q | xargs sudo docker rm -f

data/spec/integration/platforms/localhost/scenarios/deploy_scenario.yml

@@ -0,0 +1,13 @@
+- node: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_scenario"
+    - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_scenario"
+    - "rm -fr /var/tmp/hello_rundock_from_deploy_src_dir_scenario"
+    - "rm -fr /var/tmp/hello_rundock_from_deploy_dst_dir_scenario"
+    - "echo 'Hello Rundock from deploy Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_scenario"
+    - "mkdir /var/tmp/hello_rundock_from_deploy_src_dir_scenario"
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_src_file_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_file_scenario
+    - src: /var/tmp/hello_rundock_from_deploy_src_dir_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_dir_scenario

data/spec/integration/recipes/deploy_spec.rb

@@ -0,0 +1,10 @@
+require 'spec_helper'
+
+describe file('/var/tmp/hello_rundock_from_deploy_dst_file_scenario') do
+  it { should be_file }
+  its(:content) { should match(/Hello Rundock from deploy Scenario./) }
+end
+
+describe file('/var/tmp/hello_rundock_from_deploy_dst_dir_scenario') do
+  it { should be_directory }
+end

data/spec/integration/scenarios/deploy_scenario.yml

@@ -0,0 +1,26 @@
+- node: localhost
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_src_file_scenario"
+    - "rm -fr /var/tmp/hello_rundock_from_deploy_src_dir_scenario"
+    - "echo 'Hello Rundock from deploy Scenario.' > /var/tmp/hello_rundock_from_deploy_src_file_scenario"
+    - "mkdir /var/tmp/hello_rundock_from_deploy_src_dir_scenario"
+- node: anyhost-01
+  command:
+    - "rm -f /var/tmp/hello_rundock_from_deploy_dst_file_scenario"
+    - "rm -fr /var/tmp/hello_rundock_from_deploy_dst_dir_scenario"
+  task:
+    - deploy_task
+---
+anyhost-01:
+  host: 172.17.42.1
+  ssh_opts:
+    port: 22222
+    user: tester
+    key: "<replaced_by_platforms>"
+---
+deploy_task:
+  deploy:
+    - src: /var/tmp/hello_rundock_from_deploy_src_file_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_file_scenario
+    - src: /var/tmp/hello_rundock_from_deploy_src_dir_scenario
+      dst: /var/tmp/hello_rundock_from_deploy_dst_dir_scenario

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rundock
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.3.0
 platform: ruby
 authors:
 - hiracy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -168,6 +168,7 @@ files:
 - lib/rundock/operation/command.rb
 - lib/rundock/operation/task.rb
 - lib/rundock/operation_factory.rb
+- lib/rundock/plugin/operation/deploy.rb
 - lib/rundock/plugin/operation/host_inventory.rb
 - lib/rundock/plugin/operation/sample_operation.rb
 - lib/rundock/runner.rb
@@ -178,13 +179,16 @@ files:
 - spec/integration/groups/simple_host_group.yml
 - spec/integration/platforms/centos6/Dockerfile
 - spec/integration/platforms/centos6/setup.sh
+- spec/integration/platforms/localhost/scenarios/deploy_scenario.yml
 - spec/integration/platforms/localhost/scenarios/run_anyway_scenario.yml
 - spec/integration/platforms/localhost/scenarios/simple_echo_scenario.yml
 - spec/integration/platforms/localhost/scenarios/simple_plugin_scenario.yml
 - spec/integration/platforms/localhost/scenarios/use_default_ssh_scenario.yml
+- spec/integration/recipes/deploy_spec.rb
 - spec/integration/recipes/simple_echo_scenario_spec.rb
 - spec/integration/recipes/simple_echo_spec.rb
 - spec/integration/recipes/simple_plugin_scenario_spec.rb
+- spec/integration/scenarios/deploy_scenario.yml
 - spec/integration/scenarios/simple_echo_scenario.yml
 - spec/integration/scenarios/simple_plugin_scenario.yml
 - spec/integration/scenarios/use_default_ssh_scenario.yml