cloudflock 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 421fa1e64759c72ef901ee7431000811e635e4d1
-  data.tar.gz: 570f428da5e21ae71020b3eaf6d9e93a5c5a9e9c
+  metadata.gz: 5caf060aa6dffa12338aee4f8e6bc50a7d924ca0
+  data.tar.gz: 7dc01d5bb4c01a7037bc848e8d46911da697c5e3
 SHA512:
-  metadata.gz: 444ea7d4d45b7d614f41005f69e606d32d8a92a0e44d0f75d7291e14770acf75af8799cd45d88b216f6c13f6dcb3f67495844c85393ddf3c799c83aab032a76a
-  data.tar.gz: 30714d89645a257a8bc7481d05d5700a8d54f433d484335b7caabc24c3464a35d735e5d15d5f77fbd2e465c0bed6d00f60c2a5a4bdbe309911f8c9b0c0f2ed78
+  metadata.gz: 78c8c3e2a955ce7b0cbf0d201121f4ff3c8c6186079955657b23c4a5cbe53ffdbcab0e175805f068037a0a848c54d74b48973d098af4352c3888110126a37690
+  data.tar.gz: 77435605a9983bc72686a472b948a8ce061ba4387fe5f551dbd58cbe8de40d122c7f7742168296ae6af112101d5b5959d5a883fb6b63562bdc02f0149a57cd46

data/lib/cloudflock/app/common/servers.rb

@@ -71,8 +71,8 @@ module CloudFlock; module App
       check_option(host, :hostname, "#{name} host")
       check_option(host, :port, "#{name} SSH port", default_answer: '22')
       check_option(host, :username, "#{name} username", default_answer: 'root')
-      check_option(host, :password, "#{name} password",
-                   default_answer: '', allow_empty: true)
+      check_option_pw(host, :password, "#{name} password",
+                      default_answer: '', allow_empty: true)
 
       key_path = File.join(Dir.home, '.ssh', 'id_rsa')
       key_path = '' unless File.exists?(key_path)
@@ -87,7 +87,7 @@ module CloudFlock; module App
       if host[:username] == 'root' || host[:sudo]
         host[:root_password] = host[:password]
       else
-        check_option(host, :root_password, 'Password for root')
+        check_option_pw(host, :root_password, 'Password for root')
       end
 
       host

data/lib/cloudflock/app.rb

@@ -44,6 +44,24 @@ module CloudFlock
       options[name] = UI.prompt_filesystem(prompt, prompt_options)
     end
 
+    # Public: Wrap check_option, disabling local echo for password entry if the
+    # option is not set.
+    #
+    # options        - Hash containing options to test against.
+    # name           - The key in the options Hash expected to contain the
+    #                  response desired.
+    # prompt         - Prompt to present to the user.
+    # prompt_options - Options to pass along to ConsoleGlitter::UI#prompt.
+    #                  (default: {})
+    #
+    # Returns the contents of the options[name] or else a String if
+    # options[name] is nil.
+    def check_option_pw(options, name, prompt, prompt_options = {})
+      return options[name] unless options[name].nil?
+
+      options[name] = UI.secure_prompt(prompt, prompt_options)
+    end
+
     # Public: Check if an option is set; return the value if so, otherwise
     # prompt the user for a response.
     #

data/lib/cloudflock/error.rb

@@ -7,7 +7,8 @@ module CloudFlock
 
   module Remote
     class SSH
-      class InvalidHostname < StandardError; end
+      class InvalidHostname  < StandardError; end
+      class SSHCannotConnect < StandardError; end
     end
   end
 end

data/lib/cloudflock/errstr.rb

@@ -10,8 +10,9 @@ module CloudFlock
   module Remote
     class SSH
       module Errstr
-        NOHOST        = 'No host specified'
-        INVALID_HOST  = 'Unable to look up host: %s'
+        NOHOST         = 'No host specified'
+        INVALID_HOST   = 'Unable to look up host: %s'
+        CANNOT_CONNECT = 'Unable to connect to host: %s'
       end
     end
   end

data/lib/cloudflock/remote/ssh.rb

@@ -21,6 +21,9 @@ module CloudFlock; module Remote
                     '-o ConnectTimeout=15 '            \
                     '-o ServerAliveInterval=30'
 
+    # Public: Hash containing always-set options for Net::SSH
+    NET_SSH_OPTIONS = { user_known_hosts_file: '/dev/null', paranoid: false }
+
     # Public: Prompt to be set on a host upon successful login.
     PROMPT = '@@CLOUDFLOCK@@'
 
@@ -57,6 +60,7 @@ module CloudFlock; module Remote
     def initialize(args = {})
       @options = sanitize_arguments(DEFAULT_ARGS.merge(args))
       start_session
+      start_keepalive_thread
     end
 
     # Public: Return the hostname of the host.
@@ -236,7 +240,7 @@ module CloudFlock; module Remote
     # :key_passphrase defined.
     def filter_ssh_options(args)
       valid_arguments = [:port, :password, :key_data, :key_passphrase]
-      args.select { |opt| valid_arguments.include? opt }
+      args.select { |opt| valid_arguments.include? opt }.merge(NET_SSH_OPTIONS)
     end
 
     # Internal: Resolve the hostname provided and return the network address to
@@ -259,9 +263,31 @@ module CloudFlock; module Remote
     # Sets @ssh.
     #
     # Returns nothing.
+    #
+    # Raises TooManyRetries if retry_count is greater than 4.
     def start_session
       ssh_opts = filter_ssh_options(options)
       @ssh = Net::SSH.start(options[:hostname], options[:username], ssh_opts)
+    rescue Net::SSH::Disconnect
+      retry_count = retry_count.to_i + 1
+      sleep 30 and retry if retry_count < 5
+      raise(SSHCannotConnect, Errstr::CANNOT_CONNECT % options[:hostname])
+    end
+
+    # Internal: Creates a thread which sends a keepalive message every 10
+    # seconds.
+    #
+    # Sets @keepalive.
+    #
+    # Returns nothing.
+    def start_keepalive_thread
+      @keepalive.kill if @keepalive.is_a?(Thread)
+      @keepalive = Thread.new do
+        loop do
+          sleep 10
+          @ssh.send_global_request('keepalive@openssh.com')
+        end
+      end
     end
   end
 end; end

data/lib/cloudflock.rb

@@ -4,5 +4,5 @@ require 'cloudflock/errstr'
 # Public: Encapsulate all functionality related to the CloudFlock API and any
 # apps built with such.
 module CloudFlock
-  VERSION = '0.7.1'
+  VERSION = '0.7.2'
 end

metadata

@@ -1,29 +1,49 @@
 --- !ruby/object:Gem::Specification
 name: cloudflock
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - Chris Wuest
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-07 00:00:00.000000000 Z
+date: 2014-07-16 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: fog-json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.22.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.21'
+        version: '1.22'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.22.1
 - !ruby/object:Gem::Dependency
   name: cpe
   requirement: !ruby/object:Gem::Requirement