Chef_Solo_Nodes 0.4.2 → 0.4.3

data/README.md

@@ -70,8 +70,7 @@ Usage: Shell
 
 Provides 2 executables: IP and SSH
 
-All they do is print out to standard output.  They are meant to
-generate arguments for other programs:
+They are meant to generate arguments for other programs:
 
     $ ping -c 3 $( IP --no-user file_name )
     ping -c 3 my.ip.address
@@ -85,21 +84,14 @@ generate arguments for other programs:
 **Tip:** the last example above uses
 [knife-solo](https://github.com/matschaffer/knife-solo).
 
-Usage: Errors for IP, SSH
--------------------------
-
-If the file name does not exist:
-
-    $ IP  missing_file
-    $ SSH missing_file
-    xx.xx.xx.xx
-    # exit status = 1
+**Errors:** If the file is not found, they print **xx.xx.xx.xx** 
+to standard output and exit 1. Unexpected, unplanned errors 
+are printed to standard error.
 
 Usage: IP, IP --no-user
 --------------------
 
-    $ IP file_name 
-    # Parses "nodes/file_name.json"
+    $ IP file_name     # parses node/file_name.json
     
 Depending on whether the attributes exist, the results could take
 any form of the following:
@@ -108,16 +100,12 @@ any form of the following:
     127.0.0.1:2222
     user@127.0.0.1:2222 
 
-With **--no-user**:
-
-    127.0.0.1
-    127.0.0.1:2222
+Remove **user@** with: **IP --no-user file_name**
 
 Usage: SSH, SSH --no-user
 --------------------
 
-    $ SSH file_name
-    # Parses "nodes/file_name.json"
+    $ SSH file_name    # parses node/file_name.json
 
 Depending on whether the attributes exist, the results could take
 any form of the following:
@@ -126,10 +114,7 @@ any form of the following:
     user@127.0.0.1
     -p 2222 user@127.0.0.1
 
-With **--no-user**:
-    
-    127.0.0.1
-    -p 2222 127.0.0.1 
+Remove **user@** with: **SSH --no-user file_name**
 
 Run Tests
 ---------

data/bin/IP

@@ -1,20 +1,3 @@
 #!/usr/bin/env ruby
-require "Chef_Solo_Nodes"
-require "trollop"
 
-opts = Trollop::options do
-  opt :no_user, "Avoid printing any user/login value", :default=>false
-end
-
-n = Chef_Solo_IPs(Dir.glob("nodes/#{ARGV.first}.json")).first
-
-if !n
-  print 'xx.xx.xx.xx'
-  exit 1
-end
-
-uri = URI.parse("ssh://#{n}")
-
-print "#{uri.user}@" if uri.user && !opts[:no_user]
-print "#{uri.host}"
-print ":#{uri.port}" if uri.port
+require "Chef_Solo_Nodes/shell"

data/bin/SSH

@@ -1,29 +1,4 @@
 #!/usr/bin/env ruby
-require "Chef_Solo_Nodes"
-require "trollop"
 
-opts = Trollop::options do
-  opt :no_user, "Avoid printing any user/login value", :default=>false
-end
-
-n = Chef_Solo_IPs(Dir.glob("nodes/#{ARGV.first}.json")).first
-
-unless n
-  print "xx.xx.xx.xx"
-  exit 1
-end
-
-uri = URI.parse("ssh://#{n}")
-
-str = ""
-
-if uri.port
-  str << "-p #{uri.port} "
-end
-
-if uri.user && !opts[:no_user]
-  str << "#{uri.user}@"
-end
-
-str << "#{uri.host}"
-print str
+require "Chef_Solo_Nodes/shell"
+  

data/lib/Chef_Solo_Nodes/shell.rb

@@ -0,0 +1,38 @@
+#!/usr/bin/env ruby
+
+begin
+  
+  require "Chef_Solo_Nodes"
+  require "trollop"
+
+  opts = Trollop::options do
+    opt :no_user, "Avoid printing any user/login value", :default=>false
+  end
+
+  opts[ :format ] = File.basename($0)
+  
+  glob = "nodes/#{ARGV.first}.json"
+  n = Chef_Solo_IPs(Dir.glob glob).first
+
+  raise RuntimeError, "Not found: #{glob}" unless n
+
+  uri = URI.parse("ssh://#{n}")
+
+  case opts.format
+  when "IP"
+    print "#{uri.user}@" if uri.user && !opts[:no_user]
+    print "#{uri.host}"
+    print ":#{uri.port}" if uri.port
+  when "SSH"
+    print "-p #{uri.port} " if uri.port
+    print "#{uri.user}@" if uri.user && !opts[:no_user]
+    print "#{uri.host}"
+  else
+    raise ArgumentError, "Unknown format: #{opts.format.inspect}"
+  end
+  
+rescue Object => e
+  print 'xx.xx.xx.xx'
+  raise e
+  
+end

data/lib/Chef_Solo_Nodes/version.rb

@@ -1,3 +1,3 @@
 class Chef_Solo_Nodes
-  VERSION = "0.4.2"
+  VERSION = "0.4.3"
 end

data/spec/tests/IP.rb

@@ -3,13 +3,13 @@ describe "IP" do
   
   it "prints xx.xx.xx.xx if file is not found" do
     chdir {
-      `IP not.found.json`.should == "xx.xx.xx.xx"
+      `IP wrong.droids 2>/dev/null`.should == "xx.xx.xx.xx"
     }
   end
 
   it "exists with 1 if not found" do
     chdir {
-      `IP not.found.json`
+      `IP dana.carveys.billions 2>/dev/null`
       $?.exitstatus.should == 1
     }
   end

data/spec/tests/SSH.rb

@@ -3,13 +3,13 @@ describe "SSH" do
   
   it "prints xx.xx.xx.xx if file is not found" do
     chdir {
-      `SSH not.found.json`.should == "xx.xx.xx.xx"
+      `SSH mr.x.is.homer 2>/dev/null`.should == "xx.xx.xx.xx"
     }
   end
 
   it "exists with 1 if not found" do
     chdir {
-      `SSH not.found.json`
+      `SSH murray.rothbards.diet.plans 2>/dev/null`
       $?.exitstatus.should == 1
     }
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Chef_Solo_Nodes
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
   prerelease: 
 platform: ruby
 authors:
@@ -110,6 +110,7 @@ files:
 - bin/IP
 - bin/SSH
 - lib/Chef_Solo_Nodes.rb
+- lib/Chef_Solo_Nodes/shell.rb
 - lib/Chef_Solo_Nodes/version.rb
 - spec/data/nodes/Vagrant.json
 - spec/data/nodes/custom_port.json