Chef_Solo_Nodes 0.1.0 → 0.2.0

data/Chef_Solo_Nodes.gemspec

@@ -24,7 +24,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency 'Bacon_Colored'
   s.add_development_dependency 'pry'
   
-  # s.rubyforge_project = "Chef_Solo_Nodes"
-  # specify any dependencies here; for example:
-  s.add_runtime_dependency "json"
+  s.add_runtime_dependency "trollop"
 end

data/LICENSE

@@ -0,0 +1,22 @@
+Copyright (c) 2012 da99
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

data/README.md

@@ -10,8 +10,8 @@ Installation
 
     gem install Chef_Solo_Nodes
 
-Usage
------
+Ruby Usage
+----------
 
     require "Chef_Solo_Nodes"
 
@@ -19,11 +19,49 @@ Usage
     Chef_Solo_Nodes('role_name') # ===> [ Hash, Hash ]
     Chef_Solo_IPs('db') # ===> [ String, String ]
 
+Capistrano Usage
+----------------
+
+   require "Chef_Solo_Nodes"
+   role :app, *Chef_Solo_IPs('app')
+   role :db, *Chef_Solo_IPs('db')
+
+Executable Usage: IP
+--------------------
+
+    $ IP file_glob  
+    127.0.0.1
+
+    $ IP file_with_specified_port
+    127.0.0.1:2222
+
+    $ IP file_with_specified_user_and_port
+    127.0.0.1:2222 # user is not included
+
+Executable Usage: SSH
+--------------------
+
+    $ SSH file_glob  
+    127.0.0.1
+
+    $ SSH file_with_specified_user_or_login
+    vagrant@127.0.0.1
+
+    $ SSH file_with_specified_port
+    -p 2222 vagrant@127.0.0.1
+
+    $ ssh `SSH vagrant`
+    ssh -p 2222 vagrant@127.0.0.1
+
+    $ knife `SSH file_name`
+    knife vagrant@localhost:2222
+
+
 Implementation
 --------------
 
   It grabs all your files using Dir.glob("./nodes/\*.json").
 Chef\_Solo\_IPS() also does some magic. 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)
+[It's just one page long.](https://github.com/da99/Chef_Solo_Nodes/blob/master/lib/Chef_Solo_Nodes.rb)
 

data/bin/IP

@@ -0,0 +1,12 @@
+#!/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/SSH

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+
+require "Chef_Solo_Nodes"
+
+n = Chef_Solo_Nodes(Dir.glob("nodes/#{ARGV.first}.json")).first
+
+unless n
+  print "xx.xx.xx.xx"
+  exit 1
+end
+
+str = ""
+if n['port']
+  str += "-p #{n['port']} "
+end
+
+login = n['user'] || n['login']
+if login
+  str += "#{login}@"
+end
+
+str += "#{n['ipaddress']}"
+print str

data/lib/Chef_Solo_Nodes/version.rb

@@ -1,3 +1,3 @@
 class Chef_Solo_Nodes
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/Chef_Solo_Nodes.rb

@@ -2,17 +2,21 @@ require 'Chef_Solo_Nodes/version'
 require "json"
 
 def Chef_Solo_Nodes raw_role = '*'
-  role = raw_role.to_s
-  all  = Dir.glob("nodes/*.json").map { |str| 
+  
+  if raw_role.is_a?(Array)
+    role = '*'
+    targets = raw_role
+  else
+    role = raw_role.to_s
+    targets = Dir.glob("nodes/*.json")
+  end
+  
+  targets.map { |str| 
     h = JSON(File.read(str))
+    next if role != '*' && !(h['roles'] || []).include?(role)
     h['ipaddress'] ||= File.basename(str).sub(".json", "")
     h
-  }
-  return all if role == '*'
-  
-  all.select { |h| 
-    (h['roles'] || []).include?(role) 
-  }
+  }.compact
 end
 
 def Chef_Solo_IPs *args

data/spec/data/nodes/Vagrant.json

@@ -0,0 +1 @@
+{ "ipaddress": "localhost", "port":2222, "roles": ["dev"]}

data/spec/data/nodes/with_login.json

@@ -0,0 +1 @@
+{ "ipaddress": "localhost", "login": "log_RjD2", "roles": ["login"] }

data/spec/data/nodes/with_port.json

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

data/spec/data/nodes/with_user.json

@@ -0,0 +1 @@
+{ "ipaddress": "localhost", "user": "RjD2", "roles": ["user"] }

data/spec/tests/IP.rb

@@ -0,0 +1,31 @@
+
+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"
+    }
+  end
+
+  it "exists with 1 if not found" do
+    chdir {
+      `IP not.found.json`
+      $?.exitstatus.should == 1
+    }
+  end
+  
+  it "returns only one result" do
+    chdir {
+      `bundle exec IP "*"`.should == "freemont"
+    }
+  end
+
+  it "does not include user if specified" do
+    chdir {
+      `bundle exec IP "with_user"`.should == "localhost"
+    }
+  end
+  
+  
+end # === IP
+

data/spec/tests/SSH.rb

@@ -0,0 +1,42 @@
+
+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"
+    }
+  end
+
+  it "exists with 1 if not found" do
+    chdir {
+      `SSH not.found.json`
+      $?.exitstatus.should == 1
+    }
+  end
+
+  it "returns one result" do
+    chdir {
+      `SSH "*"`.should == File.basename(Dir.glob("nodes/*.json").first).sub(".json", '')
+    }
+  end
+
+  it "adds -p argument if port is specified" do
+    chdir {
+      `SSH "with_port"`.should == "-p 2222 ben_and_jerry"
+    }
+  end
+
+  it "adds includes user if \"user\" is specified" do
+    chdir {
+      `SSH "with_user"`.should == "RjD2@localhost"
+    }
+  end
+
+  it "adds user if \"user\" is specified" do
+    chdir {
+      `SSH "with_login"`.should == "log_RjD2@localhost"
+    }
+  end
+  
+end # === SSH
+

data/spec/tests/bin.rb

@@ -1,10 +1,13 @@
 
-describe "permissions of bin/" do
-  
-  it "should be 750" do
-    `stat -c %a bin`.strip
-    .should.be == "750"
-  end
-  
-end # === permissions of bin/
+bins = Dir.glob("bin/*")
 
+unless bins.empty?
+  describe "permissions of bin/" do
+    bins.each { |file|
+      it "should chmod 755 for: #{file}" do
+        `stat -c %a #{file}`.strip
+        .should.be == "755"
+      end
+    }
+  end # === permissions of bin/
+end # === unless bins.empty?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: Chef_Solo_Nodes
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -76,7 +76,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: trollop
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -95,26 +95,37 @@ description: ! "\n    Use with Chef-Solo.  Grabs node info as array of Hashes or
   ips.\n  "
 email:
 - i-hate-spam-45671204@mailinator.com
-executables: []
+executables:
+- IP
+- SSH
 extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
 - Chef_Solo_Nodes.gemspec
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
+- bin/IP
+- bin/SSH
 - lib/Chef_Solo_Nodes.rb
 - lib/Chef_Solo_Nodes/version.rb
+- spec/data/nodes/Vagrant.json
 - spec/data/nodes/custom_port.json
 - spec/data/nodes/freemont.json
 - spec/data/nodes/localhost.json
 - spec/data/nodes/no_ip.json
 - spec/data/nodes/no_roles.json
+- spec/data/nodes/with_login.json
+- spec/data/nodes/with_port.json
+- spec/data/nodes/with_user.json
 - spec/helper.rb
 - spec/main.rb
 - spec/tests/Chef_Solo_IPs.rb
 - spec/tests/Chef_Solo_Nodes.rb
+- spec/tests/IP.rb
+- spec/tests/SSH.rb
 - spec/tests/bin.rb
 homepage: https://www.github.com/da99/chef_solo_nodes
 licenses: []