supply_drop 0.12.0 → 0.13.0

data/README.md

@@ -2,6 +2,8 @@
 
 supply_drop is a capistrano plugin to facitiate provisioning servers with puppet, without using the puppet server. It works by simply rsyncing your puppet configuration files to your servers and running puppet apply. It strives to allow you to write idiomatic puppet scripts while being as lightweight as possible.
 
+[![Build Status](https://secure.travis-ci.org/pitluga/supply_drop.png)](http://travis-ci.org/pitluga/supply_drop)
+
 ### Installation
 
     gem install supply_drop

data/lib/supply_drop/plugin.rb

@@ -10,7 +10,7 @@ module SupplyDrop
           SupplyDrop::Rsync.remote_address(server.user || fetch(:user, ENV['USER']), server.host, puppet_destination),
           :delete => true,
           :excludes => puppet_excludes,
-          :ssh => { :keys => ssh_options[:keys], :config => ssh_options[:config], :port => fetch(:port, nil) }
+          :ssh => ssh_options.merge(server.options[:ssh_options]||{})
         )
         logger.debug rsync_cmd
         server.host unless system rsync_cmd

data/lib/supply_drop/rsync.rb

@@ -19,19 +19,148 @@ module SupplyDrop
         [patterns].flatten.map { |p| "--exclude=#{p}" }
       end
 
+      #
+      # Convert Net::SSH options into OpenSSH options.
+      #
+      # For a list of the options normally support by Net::SSH (and thus Capistrano), see
+      # http://net-ssh.github.com/net-ssh/classes/Net/SSH.html#method-c-start
+      #
+      # Also, to see how Net::SSH does the opposite of the conversion we are doing here, check out:
+      # https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/config.rb
+      #
+      # API mismatch:
+      #
+      # * many OpenSSH options not supported
+      # * some options only make sense for Net::SSH
+      # * compression: for Net::SSH, this option is supposed to accept true, false, or algorithm. OpenSSH accepts 'yes' or 'no'
+      #
       def ssh_options(options)
         mapped_options = options.map do |key, value|
           next unless value
 
           case key
-          when :keys then [value].flatten.select { |k| File.exist?(k) }.map { |k| "-i #{k}" }
-          when :config then "-F #{value}"
-          when :port then "-p #{value}"
+          when :auth_methods            then opt_auth_methods(value)
+          when :bind_address            then opt('BindAddress', value)
+          when :compression             then opt('Compression', value ? 'yes' : 'no')
+          when :compression_level       then opt('CompressionLevel', value.to_i)
+          when :config                  then "-F '#{value}'"
+          when :encryption              then opt('Ciphers', [value].flatten.join(','))
+          when :forward_agent           then opt('ForwardAgent', value)
+          when :global_known_hosts_file then opt('GlobalKnownHostsFile', value)
+          when :hmac                    then opt('MACs', [value].flatten.join(','))
+          when :host_key                then opt('HostKeyAlgorithms', [value].flatten.join(','))
+          when :host_key_alias          then opt('HostKeyAlias', value)
+          when :host_name               then opt('HostName', value)
+          when :kex                     then opt('KexAlgorithms', [value].flatten.join(','))
+          when :key_data                then nil # not supported
+          when :keys                    then [value].flatten.select { |k| File.exist?(k) }.map { |k| "-i '#{k}'" }
+          when :keys_only               then opt('IdentitiesOnly', value ? 'yes' : 'no')
+          when :languages               then nil # not applicable
+          when :logger                  then nil # not applicable
+          when :paranoid                then opt('StrictHostKeyChecking', value ? 'yes' : 'no')
+          when :passphrase              then nil # not supported
+          when :password                then nil # not supported
+          when :port                    then "-p #{value.to_i}"
+          when :properties              then nil # not applicable
+          when :proxy                   then nil # not applicable
+          when :rekey_blocks_limit      then nil # not supported
+          when :rekey_limit             then opt('RekeyLimit', reverse_interpret_size(value))
+          when :rekey_packet_limit      then nil # not supported
+          when :timeout                 then opt('ConnectTimeout', value.to_i)
+          when :user                    then "-l #{value}"
+          when :user_known_hosts_file   then multi_opt('UserKnownHostsFile', value)
+          when :verbose                 then opt('LogLevel', interpret_log_level(value))
           end
         end.compact
 
         %[-e "ssh #{mapped_options.join(' ')}"] unless mapped_options.empty?
       end
+
+      private
+
+      def opt(option_name, option_value)
+        "-o #{option_name}='#{option_value}'"
+      end
+
+      def multi_opt(option_name, option_values)
+        [option_values].flatten.map do |value|
+          opt(option_name, value)
+        end.join(' ')
+      end
+
+      #
+      # In OpenSSH, password and pubkey default to 'yes', hostbased defaults to 'no'.
+      # Regardless, if :auth_method is configured, then we explicitly disable methods not included.
+      #
+      def opt_auth_methods(value)
+        value = [value].flatten
+        opts = []
+        if value.any?
+          if value.include? 'password'
+            opts << opt('PasswordAuthentication', 'yes')
+          else
+            opts << opt('PasswordAuthentication', 'no')
+          end
+          if value.include? 'publickey'
+            opts << opt('PubkeyAuthentication', 'yes')
+          else
+            opts << opt('PubkeyAuthentication', 'no')
+          end
+          if value.include? 'hostbased'
+            opts << opt('HostbasedAuthentication', 'yes')
+          else
+            opts << opt('HostbasedAuthentication', 'no')
+          end
+        end
+        if opts.any?
+          return opts.join(' ')
+        else
+          nil
+        end
+      end
+
+      #
+      # Converts the given integer size in bytes into a string with 'K', 'M', 'G' suffix, as appropriate.
+      #
+      # reverse of interpret_size in https://github.com/net-ssh/net-ssh/blob/master/lib/net/ssh/config.rb
+      #
+      def reverse_interpret_size(size)
+        size = size.to_i
+        if size < 1024
+          "#{size}"
+        elsif size < 1024 * 1024
+          "#{size/1024}K"
+        elsif size < 1024 * 1024 * 1024
+          "#{size/(1024*1024)}M"
+        else
+          "#{size/(1024*1024*1024)}G"
+        end
+      end
+
+      def interpret_log_level(level)
+        if level.is_a? Symbol
+          case level
+            when :debug then "DEBUG"
+            when :info then "INFO"
+            when :warn then "ERROR"
+            when :error then "ERROR"
+            when :fatal then "FATAL"
+            else "INFO"
+          end
+        elsif level.is_a? Integer
+          case level
+            when Logger::DEBUG then "DEBUG"
+            when Logger::INFO then "INFO"
+            when Logger::WARN then "ERROR"
+            when Logger::ERROR then "ERROR"
+            when Logger::FATAL then "FATAL"
+            else "INFO"
+          end
+        else
+          "INFO"
+        end
+      end
+
     end
   end
 end

data/lib/supply_drop/tasks.rb

@@ -65,10 +65,10 @@ Capistrano::Configuration.instance.load do
 
     desc "runs puppet with --noop flag to show changes"
     task :noop, :except => { :nopuppet => true } do
+      supply_drop.lock
       transaction do
         on_rollback { supply_drop.unlock }
         supply_drop.prepare
-        supply_drop.lock
         update_code
         supply_drop.noop
         supply_drop.unlock
@@ -77,10 +77,10 @@ Capistrano::Configuration.instance.load do
 
     desc "applies the current puppet config to the server"
     task :apply, :except => { :nopuppet => true } do
+      supply_drop.lock
       transaction do
         on_rollback { supply_drop.unlock }
         supply_drop.prepare
-        supply_drop.lock
         update_code
         supply_drop.apply
         supply_drop.unlock
@@ -89,7 +89,13 @@ Capistrano::Configuration.instance.load do
 
     desc "clears the puppet lockfile on the server."
     task :remove_lock, :except => { :nopuppet => true} do
-      supply_drop.lock
+      logger.important "WARNING: puppet:remove_lock is depricated, please use puppet:unlock instead"
+      supply_drop.unlock
+    end
+
+    desc "clears the puppet lockfile on the server."
+    task :unlock, :except => { :nopuppet => true} do
+      supply_drop.unlock
     end
   end
 end

metadata

@@ -1,51 +1,41 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: supply_drop
-version: !ruby/object:Gem::Version 
-  hash: 47
-  prerelease: false
-  segments: 
-  - 0
-  - 12
-  - 0
-  version: 0.12.0
+version: !ruby/object:Gem::Version
+  version: 0.13.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Tony Pitluga
 - Paul Hinze
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-10-16 00:00:00 -05:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-12-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: capistrano
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 2
-        - 5
-        - 21
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 2.5.21
   type: :runtime
-  version_requirements: *id001
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 2.5.21
 description: See http://github.com/pitluga/supply_drop
-email: 
+email:
 - tony.pitluga@gmail.com
 - paul.t.hinze@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - README.md
 - Rakefile
 - lib/supply_drop/async_enumerable.rb
@@ -59,39 +49,28 @@ files:
 - lib/supply_drop/writer/file.rb
 - lib/supply_drop/writer/streaming.rb
 - lib/supply_drop.rb
-has_rdoc: true
 homepage: http://github.com/pitluga/supply_drop
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.21
 signing_key: 
 specification_version: 3
 summary: Masterless puppet with capistrano
 test_files: []
-