solid 0.1.6.beta1 → 0.1.6.beta2

data/VERSION

@@ -1 +1 @@
-0.1.6.beta1
+0.1.6.beta2

data/bin/solid

@@ -6,4 +6,14 @@ require 'fileutils'
 require File.dirname(__FILE__) + '/../lib/solid'
 
 args = ARGV.dup
-Solid::Commands.run_chef args[0]
+if args.length > 0
+  Solid::Commands.new(args[0]) { run_chef }
+else
+  puts <<-MSG
+
+****  Welcome to Solid       ******
+****  Version 0.1.6.beta2      ****
+****  json config file require ****
+
+MSG
+end

data/lib/solid/chef.rb

@@ -31,13 +31,13 @@ module Solid
       result =~ /chef-solo/
     end
     
-    def solo
+    def run_solo
       @logger.info "deploying..."
       build_json 
       run_solo 
     end
     
-protected
+  protected
     
     def options
       o = @dna['ssh-auth'] == 'key' ? { :keys => @dna["key"] } : { :password => @dna["password"] }
@@ -45,7 +45,7 @@ protected
       o
     end
     
-private
+  private
         
     
     def sudo_cmd

data/lib/solid/commands.rb

@@ -1,54 +1,28 @@
 module Solid
-  
-  module Commands
-    
-    class << self
+  class Commands    
+    include Solid::Errors
+    include Solid::Json
       
-      def run_chef(file)
-        dna = Crack::JSON.parse(dna(file))
-        dna["servers"].each do |server|
-          run server, dna
-        end
-
-#         if validate_dna
-#           dna["servers"].each do |s|
-#             run(s, dna)
-#           end
-#         else
-#           puts <<-PRINT
-# The following nodes in your json are required:
-# 
-# * servers
-# * ssh-auth
-# 
-# if ssh-auth = key
-# * key
-# 
-# if ssh-auth = pwd
-# 
-# * password
-# 
-# * cookbooks
-# 
-#           PRINT
-#         end
-      end
-                  
-  
-    private
-  
-      def run server, with_dna  
-        Chef.new(server, with_dna) do
-          install
-          solo
-        end   
-      end
+    def initialize with_dna_file, &block
+      @dna = parse_dna(with_dna_file)
+      validate_dna
+      self.instance_eval(&block) if block_given?
+    end
     
-  
-      def dna file
-        File.open(file, 'r') { |f| f.read }
+    def run_chef
+      @dna["servers"].each do |server|
+        run server
       end
-    
     end
+                
+
+  private
+
+    def run server 
+      Chef.new(server, @dna) do
+        install
+        run_solo
+      end   
+    end  
   end
 end

data/lib/solid/errors.rb

@@ -0,0 +1,35 @@
+module Solid
+  module Errors
+    SERVER_REQUIRED = "Servers Node Required!"
+    SSH_AUTH_REQUIRED = "SSH AUTH Node Required! (key or pwd)"
+    SSH_KEY_REQUIRED = "SSH Key node required!"
+    SSH_PWD_REQUIRED = "SSH Password node required!"
+
+  private
+  
+    def validate_dna
+      validate_dna_server
+      validate_ssh_auth
+      validate_ssh_key if @dna['ssh-auth'] == 'key'
+      validate_ssh_pwd if @dna['ssh-auth'] == 'pwd'
+    end
+
+    def validate_dna_server
+      raise SERVER_REQUIRED unless @dna['servers']      
+    end
+
+    def validate_ssh_auth
+      raise SSH_AUTH_REQUIRED unless @dna['ssh-auth'] =~ /key|pwd/      
+    end
+
+    def validate_ssh_key
+      raise SSH_KEY_REQUIRED unless @dna['key']
+    end
+
+    def validate_ssh_pwd
+      raise SSH_PWD_REQUIRED unless @dna['password']
+    end
+
+  end
+  
+end

data/lib/solid/json.rb

@@ -0,0 +1,13 @@
+module Solid
+  module Json
+    
+  private
+    def parse_dna(with_file) 
+      Crack::JSON.parse(read_dna(with_file))
+    end
+    
+    def read_dna file
+      File.open(file, 'r') { |f| f.read }
+    end    
+  end  
+end

data/lib/solid.rb

@@ -2,6 +2,8 @@ require 'net/ssh'
 require 'crack'
 require 'json/pure'
 require File.dirname(__FILE__) + '/solid/constants'
+require File.dirname(__FILE__) + '/solid/errors'
+require File.dirname(__FILE__) + '/solid/json'
 require File.dirname(__FILE__) + '/solid/ssh'
 require File.dirname(__FILE__) + '/solid/chef'
 require File.dirname(__FILE__) + '/solid/commands'

data/solid.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solid}
-  s.version = "0.1.6.beta1"
+  s.version = "0.1.6.beta2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thing-3"]
@@ -31,9 +31,15 @@ Gem::Specification.new do |s|
      "lib/solid/chef.rb",
      "lib/solid/commands.rb",
      "lib/solid/constants.rb",
+     "lib/solid/errors.rb",
+     "lib/solid/json.rb",
      "lib/solid/ssh.rb",
      "solid.gemspec",
      "spec/fixtures/dna.json",
+     "spec/fixtures/error.json",
+     "spec/fixtures/no_ssh.json",
+     "spec/fixtures/no_ssh_keys.json",
+     "spec/fixtures/no_ssh_pwd.json",
      "spec/lib/solid/chef_spec.rb",
      "spec/lib/solid/commands_spec.rb",
      "spec/spec.opts",
@@ -42,7 +48,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/jackhq/solid}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{ssh deployment application}
   s.test_files = [
     "spec/lib/solid/chef_spec.rb",
@@ -54,7 +60,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<net-ssh>, [">= 0"])
       s.add_runtime_dependency(%q<crack>, [">= 0"])
       s.add_runtime_dependency(%q<json_pure>, [">= 0"])

data/spec/fixtures/error.json

@@ -0,0 +1,4 @@
+{ 
+  'user': 'ubuntu', 
+  'group': 'ubuntu'
+}

data/spec/fixtures/no_ssh.json

@@ -0,0 +1,6 @@
+{ 
+  'servers': [ 'ec2-184-73-32-12.compute-1.amazonaws.com'],
+  'user': 'ubuntu', 
+  'group': 'ubuntu',
+  'key': "~/.ec2/ec2-dev"
+}

data/spec/fixtures/no_ssh_keys.json

@@ -0,0 +1,6 @@
+{ 
+  'servers': [ 'ec2-184-73-32-12.compute-1.amazonaws.com'],
+  'ssh-auth': 'key',
+  'user': 'ubuntu', 
+  'group': 'ubuntu'
+}

data/spec/fixtures/no_ssh_pwd.json

@@ -0,0 +1,6 @@
+{ 
+  'servers': [ 'ec2-184-73-32-12.compute-1.amazonaws.com'],
+  'ssh-auth': 'pwd',
+  'user': 'ubuntu', 
+  'group': 'ubuntu'
+}

data/spec/lib/solid/chef_spec.rb

@@ -42,7 +42,7 @@ describe "Solid::Chef" do
     Net::SSH.stub!(:start).and_return(ssh)
 
     Solid::Chef.new(@server, @with_dna) do
-      print solo
+      print run_solo
     end    
     
   end

data/spec/lib/solid/commands_spec.rb

@@ -1,10 +1,40 @@
 require File.dirname(__FILE__) + '/../../spec_helper'
 
 describe "Solid::Command" do
+  before(:each) do
+    Solid::Chef.stub!(:new).and_return(true)    
+  end
+  
   it "should run chef" do
-    Solid::Chef.stub!(:new).and_return(true)
     file = File.dirname(__FILE__) + '/../../fixtures/dna.json'
-    Solid::Commands.run_chef file
+    Solid::Commands.new(file) { run_chef }
   end
+
+  context "should raise exception if missing" do
+    
+    it "required server attribute" do 
+      test_validate 'error', Solid::Errors::SERVER_REQUIRED 
+    end
+    
+    it "required ssh_auth attribute" do
+      test_validate 'no_ssh', Solid::Errors::SSH_AUTH_REQUIRED
+    end
+
+    it "required ssh_key attribute" do
+      test_validate 'no_ssh_keys', Solid::Errors::SSH_KEY_REQUIRED
+    end
+
+    it "required ssh_pwd attribute" do
+      test_validate 'no_ssh_pwd', Solid::Errors::SSH_PWD_REQUIRED
+    end
   
-end
+    def test_validate(file_name, error)
+      file = File.dirname(__FILE__) + "/../../fixtures/#{file_name}.json"
+      lambda { Solid::Commands.new(file) { run_chef } }.should raise_error(error)
+    
+    end
+  
+  end
+  
+end
+

metadata

@@ -1,13 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: solid
 version: !ruby/object:Gem::Version 
+  hash: -1848230054
   prerelease: true
   segments: 
   - 0
   - 1
   - 6
-  - beta1
-  version: 0.1.6.beta1
+  - beta2
+  version: 0.1.6.beta2
 platform: ruby
 authors: 
 - Thing-3
@@ -22,9 +23,11 @@ dependencies:
   name: net-ssh
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -34,9 +37,11 @@ dependencies:
   name: crack
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -46,9 +51,11 @@ dependencies:
   name: json_pure
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -76,9 +83,15 @@ files:
 - lib/solid/chef.rb
 - lib/solid/commands.rb
 - lib/solid/constants.rb
+- lib/solid/errors.rb
+- lib/solid/json.rb
 - lib/solid/ssh.rb
 - solid.gemspec
 - spec/fixtures/dna.json
+- spec/fixtures/error.json
+- spec/fixtures/no_ssh.json
+- spec/fixtures/no_ssh_keys.json
+- spec/fixtures/no_ssh_pwd.json
 - spec/lib/solid/chef_spec.rb
 - spec/lib/solid/commands_spec.rb
 - spec/spec.opts
@@ -93,16 +106,20 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">"
     - !ruby/object:Gem::Version 
+      hash: 25
       segments: 
       - 1
       - 3
@@ -111,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: ssh deployment application