Chef_Solo_Nodes 0.2.5 → 0.3.0

data/README.md

@@ -10,7 +10,7 @@ Installation
 
     gem install Chef_Solo_Nodes
 
-Ruby Usage
+Usage: Ruby
 ----------
 
     require "Chef_Solo_Nodes"
@@ -19,31 +19,45 @@ Ruby Usage
     Chef_Solo_Nodes('role_name') # ===> [ Hash, Hash ]
     Chef_Solo_IPs('db') # ===> [ String, String ]
 
-Capistrano Usage
+Usage: Capistrano
 ----------------
 
     require "Chef_Solo_Nodes"
     role :app, *Chef_Solo_IPs('app')
     role :db, *Chef_Solo_IPs('db')
 
-Executable Usage: IP
+Usage: CAP\_IP
 --------------------
 
-    $ IP file_glob  
-    127.0.0.1
+    $ CAP_IP file_name 
+    127.0.0.1  
+    # Read from nodes/file_name.json
 
-    $ IP file_with_specified_port
+    $ CAP_IP file_with_port
     127.0.0.1:2222
 
-    $ IP file_with_specified_user_and_port
-    127.0.0.1:2222 # user is not included
+    $ CAP_IP file_with_user_and_port
+    vagrant@127.0.0.1:2222 
 
-Executable Usage: SSH
+Usage: IP
 --------------------
 
-    $ SSH file_glob  
+The user is excluded in the final print out, unlike with CAP\_IP.
+
+    $ IP file_with_user_and_port
+    127.0.0.1:2222
+    # Read from nodes/file_with_user_and_port.json
+    
+    $ IP file_with_no_port
     127.0.0.1
 
+Usage: SSH
+--------------------
+
+    $ SSH file_name
+    127.0.0.1
+    # Read from nodes/file_name.json
+
     $ SSH file_with_specified_user_or_login
     vagrant@127.0.0.1
 
@@ -60,12 +74,7 @@ Executable Usage: SSH
 Implementation
 --------------
 
-It's easier to
-understand if you see the code. 
+It's easier to understand if you see the code. 
 [It's just one page long.](https://github.com/da99/Chef_Solo_Nodes/blob/master/lib/Chef_Solo_Nodes.rb)
 
-[bin/SSH](https://github.com/da99/Chef_Solo_Nodes/blob/master/bin/SSH)
-
-[bin/IP](https://github.com/da99/Chef_Solo_Nodes/blob/master/bin/IP)
-
 

data/bin/CAP_IP

@@ -0,0 +1,11 @@
+#!/usr/bin/env ruby
+require "Chef_Solo_Nodes"
+
+n = Chef_Solo_IPs(Dir.glob("nodes/#{ARGV.first}.json")).first
+
+unless n
+  print 'xx.xx.xx.xx'
+  exit 1
+end
+
+print n

data/bin/IP

@@ -8,5 +8,9 @@ unless n
   exit 1
 end
 
+uri = URI.parse("ssh://#{n}")
 
-print n
+print "#{uri.host}"
+if uri.port
+  print ":#{uri.port}"
+end

data/bin/SSH

@@ -2,22 +2,24 @@
 
 require "Chef_Solo_Nodes"
 
-n = Chef_Solo_Nodes(Dir.glob("nodes/#{ARGV.first}.json")).first
+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 n['port']
-  str += "-p #{n['port']} "
+
+if uri.port
+  str << "-p #{uri.port} "
 end
 
-login = n['user'] || n['login']
-if login
-  str += "#{login}@"
+if uri.user
+  str << "#{uri.user}@"
 end
 
-str += "#{n['ipaddress']}"
+str << "#{uri.host}"
 print str

data/lib/Chef_Solo_Nodes.rb

@@ -1,4 +1,5 @@
 require 'Chef_Solo_Nodes/version'
+require "uri"
 require "json"
 
 # 
@@ -40,7 +41,13 @@ end
 #
 def Chef_Solo_IPs *args
   Chef_Solo_Nodes(*args).map { |h| 
-    [ h['ipaddress'] || h['hostname'], h['port'] ].compact.join(':')
+    u = h['user'] || h['login']
+    a = h['ipaddress'] || h['hostname'] 
+    p = h['port'] 
+
+    final = [u, a].compact.join('@')
+    final = [final, p].compact.join(':')
+    final
   }
 end
 

data/lib/Chef_Solo_Nodes/version.rb

@@ -1,3 +1,3 @@
 class Chef_Solo_Nodes
-  VERSION = "0.2.5"
+  VERSION = "0.3.0"
 end

data/spec/data/nodes/with_port.json

@@ -1 +1 @@
-{ "ipaddress": "ben_and_jerry", "port":2222, "roles": ["port"] }
+{ "ipaddress": "BenNJer", "port":2222, "roles": ["port"] }

data/spec/tests/CAP_IP.rb

@@ -0,0 +1,31 @@
+
+describe "CAP_IP" do
+  
+  it "prints xx.xx.xx.xx if file is not found" do
+    chdir {
+      `CAP_IP not.found.json`.should == "xx.xx.xx.xx"
+    }
+  end
+
+  it "exists with 1 if not found" do
+    chdir {
+      `CAP_IP not.found.json`
+      $?.exitstatus.should == 1
+    }
+  end
+  
+  it "returns only one result" do
+    chdir {
+      `bundle exec CAP_IP "*"`.should == "freemont"
+    }
+  end
+
+  it "includes user if specified" do
+    chdir {
+      `bundle exec CAP_IP "with_user"`.should == "RjD2@localhost"
+    }
+  end
+  
+  
+end # === IP
+

data/spec/tests/Chef_Solo_IPs.rb

@@ -21,6 +21,13 @@ describe "Chef_Solo_IPs()" do
       .should == [ "custom_port:1234"]
     }
   end
+
+  it "includes user in address: user@address" do
+    chdir {
+      Chef_Solo_IPs('login').
+      should == [ "log_RjD2@localhost"]
+    }
+  end
   
 end # === Chef_Solo_IPs
 

data/spec/tests/SSH.rb

@@ -22,11 +22,11 @@ describe "SSH" do
 
   it "adds -p argument if port is specified" do
     chdir {
-      `SSH "with_port"`.should == "-p 2222 ben_and_jerry"
+      `SSH "with_port"`.should == "-p 2222 BenNJer"
     }
   end
 
-  it "adds includes user if \"user\" is specified" do
+  it "adds user if \"user\" is specified" do
     chdir {
       `SSH "with_user"`.should == "RjD2@localhost"
     }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Chef_Solo_Nodes
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -96,6 +96,7 @@ description: ! "\n    Use with Chef-Solo.  Grabs node info as array of Hashes or
 email:
 - i-hate-spam-45671204@mailinator.com
 executables:
+- CAP_IP
 - IP
 - SSH
 extensions: []
@@ -107,6 +108,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- bin/CAP_IP
 - bin/IP
 - bin/SSH
 - lib/Chef_Solo_Nodes.rb
@@ -122,6 +124,7 @@ files:
 - spec/data/nodes/with_user.json
 - spec/helper.rb
 - spec/main.rb
+- spec/tests/CAP_IP.rb
 - spec/tests/Chef_Solo_IPs.rb
 - spec/tests/Chef_Solo_Nodes.rb
 - spec/tests/IP.rb