ssh-short 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
 SHA512: 
-  data.tar.gz: 57d071b428d1f9cd7c1d4d35468d3ab0aed81826f7958a234b49f29b3a5b31ba9a996daf921846b4c137140a9c40c9d13a707036f8fa1abe7242091b6476985f
-  metadata.gz: d78446918da032b69cef111cc5fd1ad863b9998d3c7d000aea20f509a54448fbf47d9b1a95f182c2ea5220e51c43e002b887ca26ac0bb462dc4e9f4c907a16f7
+  metadata.gz: bbe973b7717c28b471aabdc48d745b426a06ca643b5e73917718d3a82e56fb21b80a4ac4c673777cf43c06889b029e56ea3d44fe778ae6a15e0850666c3471ac
+  data.tar.gz: 76944a2e2c54ec68e1ce484fe8aea6dc45ed5e46267a5d4ce7f8e339345b1456ab0e31f2f8e7e5e8bb4cbba0292bc491553d04181a9ea296207e45b56cb2852c
 SHA1: 
-  data.tar.gz: a104fd336517f5d569c8910c44e9a9cbf9090c11
-  metadata.gz: 92180626001f2978d271f23f00d4b48abab2bd97
+  metadata.gz: 20e9987e3c98a5143b9e66939a19eab801e22e7d
+  data.tar.gz: f7e8835fb92e1f2f930755a26b2eaec005e1f4b3

data/lib/ssh_short/cli.rb

@@ -29,6 +29,10 @@ module SshShort
       if node[:key].nil? or args[:force_key_prompt]
         node[:key] = key_set.prompt_for_key
       end
+      if node[:user].nil?
+        abort 'No user was provided and no default is set' unless config[:default_user]
+        node[:user] = config[:default_user]
+      end
       node = CLI.add_options_if_present(node, args, [:alias, :user])
 
       node_mapper.update_node(node)

data/lib/ssh_short/parser.rb

@@ -18,7 +18,7 @@ module SshShort
       options = self.key_options args, {}
       options = self.alias_option args, options
       options = self.action_options args, options
-      options = self.user_options args, options, config[:default_user]
+      options = self.user_options args, options
       options = self.node_options args, options, config[:ip_mask]
       options
     end
@@ -40,14 +40,11 @@ module SshShort
       options
     end
 
-    def self.user_options(args, options, default_user)
+    def self.user_options(args, options)
       user_index = args.index('-u')
       if user_index
         options[:user] = args[user_index + 1]
         2.times { args.delete_at user_index }
-      else
-        abort 'No user was provided and no default is set' unless default_user
-        options[:user] = default_user
       end
       options
     end

data/lib/ssh_short/version.rb

@@ -1,3 +1,3 @@
 module SshShort
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/spec/ssh_short/parser_spec.rb

@@ -91,23 +91,11 @@ describe SshShort::Parser do
 
     context 'when no user is provided' do
 
-      it 'uses the default user from config' do
+      it 'leaves the user unset' do
         options = SshShort::Parser.parse_input(config, standard_args)
-        expect(options[:user]).to eq 'user'
+        expect(options).to_not include(:user)
       end
 
-      context 'and when config user is null' do
-
-        let(:no_user_config) { config.delete_if{|k, v| k == :default_user} }
-
-        it 'aborts with error message' do
-          expect {
-            expect {
-              SshShort::Parser.parse_input(no_user_config, standard_args)
-            }.to raise_error SystemExit
-          }.to output(/No user was provided/).to_stderr
-        end
-      end
     end
 
     context 'when a user is provided' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: ssh-short
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Tom Poulton
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2015-09-23 00:00:00 Z
+date: 2015-09-25 00:00:00 Z
 dependencies: []
 
 description: Easy ssh