solid 0.1.4.rc1 → 0.1.6.beta1

data/Gemfile

@@ -0,0 +1,5 @@
+source :gemcutter
+
+gem "net-ssh"
+gem "crack"
+gem "json_pure"

data/README.md

@@ -0,0 +1,80 @@
+# solid
+
+  Version: 0.1.6.beta1
+
+Solid is a CLI that uses ssh to remote into your servers and run chef-solo.
+
+Solid uses Chef 9.8 and Chef-Solo to build servers remotely.  Its goal is to be very easy to use.  Chef-Solo is a command-line application that can execute the chef recipes once installed on the server.  Chef-Solo has to be executed on the server node, but we want to execute it remotely.  So "Solid" uses the Net::SSH library to connect securely and run chef-solo.  It also checks to see if chef-solo is installed, and if it is not, it installs chef.  Solid takes one parameter, a path to a configuration json file.  This file contains all the attributes you would like to pass to chef-solo, plus some additional attributes that instruct Solid on how to connect to your server nodes, and the location of your cookbooks.
+
+    solid configuration.json
+    
+    # configuration.json
+    
+    {
+      "servers": ["server1","server2"],
+      "ssh-auth": "key",
+      "run_list": ["role[name]"],
+      "owner": "[USER]",
+      "group": "[GROUP]"
+    }
+
+    
+    
+## Requirements
+
+* Ruby
+* RubyGems
+* net/ssh
+
+## Install
+
+      gem install solid
+
+## Download Source
+
+      http://github.com/jackhq/solid
+
+
+## What is a dna.json file?
+
+It is a file that contains instructions for chef on how to setup and configure your servers, and applications.  To learn more go to http://opscode.com
+
+    {
+      "servers": ["server1","server2"],
+      "ssh-auth": "key",
+      "run_list": ["role[name]"],
+      "owner": "[USER]",
+      "group": "[GROUP]"
+    }
+
+## How to use
+
+* Create your dna.json file
+
+* Make sure it has the following root attributes:
+
+  * servers - array of servers
+  * ssh-auth - (key|pwd) - type ssh authentication
+  * key - if ssh authentication is key based
+  * password - if ssh authentication is pwd based
+  * port
+
+* Execute
+
+    solid dna.json
+
+
+
+## Note on Patches/Pull Requests
+ 
+* Fork the project.
+* Make your feature addition or bug fix.
+* Add tests for it. This is important so I don't break it in a
+  future version unintentionally.
+* Commit, do not mess with rakefile, version, or history.
+  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
+* Send me a pull request. Bonus points for topic branches.
+
+== Copyright
+
+Copyright (c) 2010 Thing-3. See LICENSE for details.

data/VERSION

@@ -1 +1 @@
-0.1.4.rc1
+0.1.6.beta1

data/bin/solid

@@ -6,10 +6,4 @@ require 'fileutils'
 require File.dirname(__FILE__) + '/../lib/solid'
 
 args = ARGV.dup
-
-#puts args.first
-if args.first == 'logs'
-  Solid::Commands.logs
-else
-  Solid::Commands.send(args.first, args[1])
-end
+Solid::Commands.run_chef args[0]

data/lib/solid/chef.rb

@@ -1,81 +1,87 @@
 module Solid
 
-  class Chef < Solid::Base
-    APT_GET = %w{ ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb build-essential git-core xfsprogs }
-    RUBYGEMS_DIR = 'rubygems-1.3.7'
-    RUBYGEMS_FILE = "#{RUBYGEMS_DIR}.tgz"
-    RUBYGEMS_URL = "http://rubyforge.org/frs/download.php/70696/#{RUBYGEMS_FILE}"
+  class Chef 
+    include Solid::Constants
+    include Solid::SSH
     
-    def initialize(server, user, options = {})
+    def initialize(server, dna, logger=Logger.new(STDOUT), &block)
       @server = server
-      @user = user
-      @options = options
+      @dna = dna
+      @logger = logger
+      @user = @dna["user"]
+      @cookbooks = @dna["cookbooks"]
+      self.instance_eval(&block) if block_given? 
     end
     
     def install
       unless installed?
-        Net::SSH.start(@server, @user, @options) do |ssh|
-          puts "installing..."
-          install_chef_prereqs ssh
-          install_chef_gems ssh
-          build_solo_rb ssh
-        end
+        @logger.info "installing..."
+        install_chef_prereqs
+        install_chef_gems
+        build_solo_rb
       end
     end
     
     def installed?
       result = false
-      Net::SSH.start(@server, @user, @options) do |ssh|
-        puts "checking if installed"
+      @logger.info "checking if installed"
+      Net::SSH.start(@server, @user, self.options) do |ssh|
         result = ssh.exec!("which chef-solo")
       end
       result =~ /chef-solo/
     end
     
-    def solo(dna, cookbooks, sudo=true)
-      puts @options.inspect
-      Net::SSH.start(@server, @user, @options) do |ssh|
-        puts "deploying..."
-        build_json dna, ssh
-        run_solo cookbooks, ssh
-      end      
+    def solo
+      @logger.info "deploying..."
+      build_json 
+      run_solo 
     end
     
-    private
+protected
+    
+    def options
+      o = @dna['ssh-auth'] == 'key' ? { :keys => @dna["key"] } : { :password => @dna["password"] }
+      o.merge!(:port => @dna['port']) if @dna['port']
+      o
+    end
+    
+private
+        
     
     def sudo_cmd
       'sudo '
     end
+
     
-    def install_chef_prereqs ssh
+    def install_chef_prereqs 
       [ sudo_cmd + "apt-get update -y",
         sudo_cmd + "apt-get install #{APT_GET.join(' ')}  -y",
         "wget #{RUBYGEMS_URL} && tar zxf #{RUBYGEMS_FILE} && cd #{RUBYGEMS_DIR} && sudo ruby setup.rb && sudo ln -sfv /usr/bin/gem1.8 /usr/bin/gem",
         sudo_cmd + "gem update --system"].each do |line|
-        ssh.exec! line 
+          ssh_exec line 
       end
     end
     
-    def install_chef_gems ssh
+    def install_chef_gems 
       CHEF_GEMS.each do |gem|
-        puts ssh.exec! sudo_cmd + %Q{ gem install #{gem[:name]} -v #{gem[:version]} --no-ri --no-rdoc }         
+        ssh_exec "#{sudo_cmd} gem install #{gem[:name]} -v #{gem[:version]}"
       end
     end
     
-    def build_solo_rb ssh
+    def build_solo_rb 
       ['file_cache_path "/tmp/chef-solo"', 
       'cookbook_path ["/tmp/chef-solo/cookbooks", "/tmp/chef-solo/site-cookbooks"]'].each do |line|
-        ssh.exec! "echo '#{line}' >> solo.rb" 
+        ssh_exec "echo '#{line}' >> solo.rb" 
       end
     end
     
-    def build_json dna, ssh
-      ssh.exec!("echo \"#{dna.to_json.gsub('"','\"')}\" > dna.json")
+    def build_json
+      ssh_exec "echo \"#{@dna.to_json.gsub('"','\"')}\" > dna.json"
     end
     
-    def run_solo cookbooks, ssh
-      puts ssh.exec!(sudo_cmd + " chef-solo -c ~/solo.rb -l debug -j dna.json -r #{cookbooks}")      
+    def run_solo 
+      ssh_exec sudo_cmd + " chef-solo -c ~/solo.rb -l debug -j dna.json -r #{@cookbooks}"
     end
-    
+            
   end
 end

data/lib/solid/commands.rb

@@ -4,52 +4,49 @@ module Solid
     
     class << self
       
-      def init
-        chef_solo = ChefSolo.new
-        chef_solo.install
-      end
-      
-      
-      def deploy(dna_file)
-        dna = Crack::JSON.parse(get_dna(dna_file))
-        dna["servers"].each do |s|
-          run(s, dna)
-        end
-      end
-      
-      def rollback(dna_file)
-        dna = Crack::JSON.parse(get_dna(dna_file))
-        dna.merge!(:action => 'rollback')
-        dna["servers"].each do |s|
-          run(s, dna)
+      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
-      
-      def logs
-        puts "Comming Soon!"
-      end
-      
-      
-    
+                  
   
     private
   
-      def run(s, dna)  
-        options = dna['ssh-auth'] == 'key' ? { :keys => dna["key"] } : { :password => dna["password"] }
-        options.merge!(:port => dna['port']) if dna['port']
-        chef = Chef.new(s, dna["user"], options)
-        chef.install
-        chef.solo dna, dna["cookbooks"]
+      def run server, with_dna  
+        Chef.new(server, with_dna) do
+          install
+          solo
+        end   
       end
     
   
-      def get_dna(dna_file)
-        dna = ""
-        File.open(dna_file, 'r') do |f|
-          dna = f.read
-        end
-        dna
+      def dna file
+        File.open(file, 'r') { |f| f.read }
       end
     
     end

data/lib/solid/constants.rb

@@ -0,0 +1,30 @@
+module Solid
+  module Constants
+    APT_GET = %w{ ruby ruby1.8-dev libopenssl-ruby1.8 rdoc ri irb build-essential git-core xfsprogs }
+    RUBYGEMS_DIR = 'rubygems-1.3.7'
+    RUBYGEMS_FILE = "#{RUBYGEMS_DIR}.tgz"
+    RUBYGEMS_URL = "http://rubyforge.org/frs/download.php/70696/#{RUBYGEMS_FILE}"
+    
+    CHEF_GEMS = [
+        {:name => 'uuidtools', :version => '2.1.1'},
+        {:name => 'highline', :version => '1.6.1'},
+        {:name => 'moneta', :version => '0.6.0'},
+        {:name => 'extlib', :version => '0.9.15'},
+        {:name => 'abstract', :version => '1.0.0'},
+        {:name => 'erubis', :version => '2.6.6'},
+        {:name => 'json', :version => '1.4.2'},
+        {:name => 'bunny', :version => '0.6.0'},
+        {:name => 'mime-types', :version => '1.16'},        
+        {:name => 'rest-client', :version => '1.5.1'},
+        {:name => 'systemu', :version => '1.2.0'},
+        {:name => 'mixlib-cli', :version => '1.2.0'},
+        {:name => 'mixlib-config', :version => '1.1.2'},
+        {:name => 'mixlib-log', :version => '1.1.0'},
+        {:name => 'mixlib-authentication', :version => '1.1.4'},
+        {:name => 'ohai', :version => '0.5.6'},
+        {:name => 'chef', :version => '0.9.8'}      
+      ]
+    
+    
+  end
+end

data/lib/solid/ssh.rb

@@ -0,0 +1,9 @@
+module Solid
+  module SSH
+    def ssh_exec command
+      Net::SSH.start(@server, @user, options) do |ssh|      
+        @logger.info ssh.exec! command      
+      end    
+    end    
+  end
+end

data/lib/solid.rb

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

data/solid.gemspec

@@ -5,35 +5,39 @@
 
 Gem::Specification.new do |s|
   s.name = %q{solid}
-  s.version = "0.1.4.rc1"
+  s.version = "0.1.6.beta1"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Thing-3"]
-  s.date = %q{2010-08-10}
+  s.date = %q{2010-08-13}
   s.default_executable = %q{solid}
   s.description = %q{ssh deployment application}
   s.email = %q{thing3@jackhq.com}
   s.executables = ["solid"]
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+     "README.md"
   ]
   s.files = [
     ".document",
      ".gitignore",
+     "Gemfile",
      "LICENSE",
-     "README.rdoc",
+     "README.md",
      "Rakefile",
      "VERSION",
      "bin/solid",
      "lib/solid.rb",
-     "lib/solid/base.rb",
      "lib/solid/chef.rb",
-     "lib/solid/chef_solo.rb",
      "lib/solid/commands.rb",
+     "lib/solid/constants.rb",
+     "lib/solid/ssh.rb",
      "solid.gemspec",
-     "test/helper.rb",
-     "test/test_solid.rb"
+     "spec/fixtures/dna.json",
+     "spec/lib/solid/chef_spec.rb",
+     "spec/lib/solid/commands_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/jackhq/solid}
   s.rdoc_options = ["--charset=UTF-8"]
@@ -41,8 +45,9 @@ Gem::Specification.new do |s|
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{ssh deployment application}
   s.test_files = [
-    "test/helper.rb",
-     "test/test_solid.rb"
+    "spec/lib/solid/chef_spec.rb",
+     "spec/lib/solid/commands_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then

data/spec/fixtures/dna.json

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

data/spec/lib/solid/chef_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "Solid::Chef" do
+  before(:each) do
+    @server = 'ec2-184-73-32-12.compute-1.amazonaws.com'
+    @with_dna = Crack::JSON.parse(<<-JSON
+    { 
+        'servers': [ 'ec2-184-73-32-12.compute-1.amazonaws.com'],
+        'ssh-auth': 'key',
+        'user': 'ubuntu', 
+        'group': 'ubuntu',
+        'key': "~/.ec2/ec2-dev"
+      }
+    JSON
+    )
+  end
+  
+  it "should check if chef is installed" do
+    ssh = mock("Net::SSH")
+    ssh.stub!(:exec!).and_return("chef-solo")
+    Net::SSH.stub!(:start).and_return(ssh)
+  
+    Solid::Chef.new(@server, @with_dna) do
+      print installed?
+    end    
+  end
+  
+  it "should install chef on node" do
+    ssh = mock("Net::SSH")
+    ssh.stub!(:exec!).and_return("chef-solo")
+    Net::SSH.stub!(:start).and_return(ssh)
+
+    Solid::Chef.new(@server, @with_dna) do
+      print install
+    end    
+    
+  end
+
+  it "should chef solo on node" do
+    ssh = mock("Net::SSH")
+    ssh.stub!(:exec!).and_return("chef-solo")
+    Net::SSH.stub!(:start).and_return(ssh)
+
+    Solid::Chef.new(@server, @with_dna) do
+      print solo
+    end    
+    
+  end
+  
+  
+end

data/spec/lib/solid/commands_spec.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/../../spec_helper'
+
+describe "Solid::Command" do
+  it "should run chef" do
+    Solid::Chef.stub!(:new).and_return(true)
+    file = File.dirname(__FILE__) + '/../../fixtures/dna.json'
+    Solid::Commands.run_chef file
+  end
+  
+end

data/spec/spec.opts

@@ -0,0 +1,4 @@
+--colour
+--format progress
+--loadby mtime
+--reverse

data/spec/spec_helper.rb

@@ -0,0 +1,2 @@
+require 'spec'
+require File.dirname(__FILE__) + '/../lib/solid'

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  - rc1
-  version: 0.1.4.rc1
+  - 6
+  - beta1
+  version: 0.1.6.beta1
 platform: ruby
 authors: 
 - Thing-3
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-10 00:00:00 -04:00
+date: 2010-08-13 00:00:00 -04:00
 default_executable: solid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,23 +62,27 @@ extensions: []
 
 extra_rdoc_files: 
 - LICENSE
-- README.rdoc
+- README.md
 files: 
 - .document
 - .gitignore
+- Gemfile
 - LICENSE
-- README.rdoc
+- README.md
 - Rakefile
 - VERSION
 - bin/solid
 - lib/solid.rb
-- lib/solid/base.rb
 - lib/solid/chef.rb
-- lib/solid/chef_solo.rb
 - lib/solid/commands.rb
+- lib/solid/constants.rb
+- lib/solid/ssh.rb
 - solid.gemspec
-- test/helper.rb
-- test/test_solid.rb
+- spec/fixtures/dna.json
+- spec/lib/solid/chef_spec.rb
+- spec/lib/solid/commands_spec.rb
+- spec/spec.opts
+- spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/jackhq/solid
 licenses: []
@@ -112,5 +116,6 @@ signing_key:
 specification_version: 3
 summary: ssh deployment application
 test_files: 
-- test/helper.rb
-- test/test_solid.rb
+- spec/lib/solid/chef_spec.rb
+- spec/lib/solid/commands_spec.rb
+- spec/spec_helper.rb

data/README.rdoc

@@ -1,67 +0,0 @@
-= solid
-
-An awesome way to deploy with chef!
-
-== Requirements
-
-* Ruby
-* RubyGems
-* net/ssh
-
-== Install
-
-gem install solid
-
-== Download Source
-
-http://github.com/jackhq/solid
-
-
-== What is it?
-
-Solid is a command line interface that takes a dna.json file as an argument.  It uses this file to establish a ssh connection for each of the application servers specified in the document either by user/key or user/password connections.  Then it simply looks for chef-solo, if not available, it installs chef, if available it runs chef-solo, with the dna.json file.
-
-== What is a dna.json file?
-
-It is a file that contains instructions for chef on how to setup and configure your servers, and applications.  To learn more go to http://opscode.com
-
-== How to use
-
-* Create your dna.json file
-
-* Make sure it has the following root attributes:
-
-  * servers - array of servers
-  * ssh-auth - (key|pwd) - type ssh authentication
-  * key - if ssh authentication is key based
-  * password - if ssh authentication is pwd based
-  * port
-
-* Execute
-
-solid deploy dna.json
-
-* Rollback
-
-solid rollback dna.json
-
-* Logs
-
-solid logs
-
-
-
-
-== Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-== Copyright
-
-Copyright (c) 2010 Thing-3. See LICENSE for details.

data/lib/solid/base.rb

@@ -1,25 +0,0 @@
-module Solid
-  
-  class Base
-    CHEF_GEMS = [
-      {:name => 'uuidtools', :version => '2.1.1'},
-      {:name => 'highline', :version => '1.6.1'},
-      {:name => 'moneta', :version => '0.6.0'},
-      {:name => 'extlib', :version => '0.9.15'},
-      {:name => 'erubis', :version => '2.6.6'},
-      {:name => 'json', :version => '1.4.2'},
-      {:name => 'bunny', :version => '0.6.0'},
-      {:name => 'rest-client', :version => '1.5.1'},
-      {:name => 'systemu', :version => '1.2.0'},
-      {:name => 'mixlib-authentication', :version => '1.1.4'},
-      {:name => 'mixlib-log', :version => '1.1.0'},
-      {:name => 'mixlib-cli', :version => '1.2.0'},
-      {:name => 'mixlib-config', :version => '1.1.2'},
-      {:name => 'ohai', :version => '0.5.6'},
-      {:name => 'chef', :version => '0.9.8'}      
-    ]
-
-
-    
-  end
-end

data/lib/solid/chef_solo.rb

@@ -1,13 +0,0 @@
-module Solid
-
-  class ChefSolo < Solid::Base
-    
-    def install
-      CHEF_GEMS.each do |gem|
-        %x["sudo gem install #{gem[:name]} -v #{gem[:version]}"]
-      end
-    end
-    
-  end
-end
-

data/test/helper.rb

@@ -1,10 +0,0 @@
-require 'rubygems'
-require 'test/unit'
-require 'shoulda'
-
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'solid'
-
-class Test::Unit::TestCase
-end

data/test/test_solid.rb

@@ -1,7 +0,0 @@
-require 'helper'
-
-class TestSolid < Test::Unit::TestCase
-  should "probably rename this file and start testing for real" do
-    flunk "hey buddy, you should probably rename this file and start testing for real"
-  end
-end