solokit 0.1.15 → 0.1.16

data/.rvmrc

@@ -1 +1 @@
-rvm ree-1.8.7-2011.03@solokit --create
+rvm ruby-1.9.3-p194@solokit --create

data/CHANGELOG

@@ -1,4 +1,4 @@
-0.1.14
+0.1.15
 
 Fixed deprication messages and some other things.
 

data/Gemfile.lock

@@ -1,21 +1,39 @@
 PATH
   remote: .
   specs:
-    solokit (0.1.14)
+    solokit (0.1.15)
       activesupport (>= 3.0.0)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.11)
-      i18n (~> 0.6)
-      multi_json (~> 1.0)
-    i18n (0.6.1)
-    multi_json (1.5.0)
+    activesupport (4.0.2)
+      i18n (~> 0.6, >= 0.6.4)
+      minitest (~> 4.2)
+      multi_json (~> 1.3)
+      thread_safe (~> 0.1)
+      tzinfo (~> 0.3.37)
+    atomic (1.1.14)
+    diff-lcs (1.2.5)
+    i18n (0.6.9)
+    minitest (4.7.5)
+    multi_json (1.8.4)
+    rspec (2.14.1)
+      rspec-core (~> 2.14.0)
+      rspec-expectations (~> 2.14.0)
+      rspec-mocks (~> 2.14.0)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.5)
+      diff-lcs (>= 1.1.3, < 2.0)
+    rspec-mocks (2.14.5)
+    thread_safe (0.1.3)
+      atomic
+    tzinfo (0.3.38)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler
+  rspec
   solokit!

data/Rakefile

@@ -2,3 +2,7 @@ require 'bundler'
 
 Bundler::GemHelper.install_tasks
 
+task :default do
+  system("rspec") || exit(1)
+end
+

data/lib/chef.rb

@@ -1,17 +1,20 @@
-require File.expand_path(File.join(File.dirname(__FILE__), 'ssh.rb'))
+require File.expand_path(File.join(File.dirname(__FILE__), 'ssh_login.rb'))
 
 module Solokit
   class Chef
-    def initialize(ip, name, env, debug_ssh, user = 'root')
+    def initialize(ip, name, env, debug_ssh, user = 'root', vm = nil)
       @ip, @name, @env = ip, name, env
-      @ssh = SSH.new(ip, user, debug_ssh)
+
+      # TODO: remove the assumption that chef packages are uploaded by ssh
+      #       in classes using this class.
+      @vm = vm || SshLogin.new(ip, user, debug_ssh)
     end
 
     def install(use_old_config = false)
       return true if installed?
       puts "#{@name} (#{@env}): Installing chef..."
       dpkg_options = use_old_config ? '--force-confold' : '--force-confnew'
-      @ssh.run(%{export DEBIAN_FRONTEND=noninteractive; apt-get update && apt-get upgrade -y -o Dpkg::Options::="#{dpkg_options}" && apt-get install -o Dpkg::Options::="#{dpkg_options}" ruby ruby1.8-dev libopenssl-ruby wget rsync build-essential -y && wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz && tar xfz rubygems-1.3.7.tgz && cd rubygems-1.3.7 && ruby setup.rb && cd .. && rm -rf rubygems-1.3.7* && ln -s /usr/bin/gem1.8 /usr/bin/gem && gem install chef ohai --no-ri --no-rdoc})
+      vm.run(%{export DEBIAN_FRONTEND=noninteractive; apt-get update && apt-get upgrade -y -o Dpkg::Options::="#{dpkg_options}" && apt-get install -o Dpkg::Options::="#{dpkg_options}" ruby ruby1.8-dev libopenssl-ruby wget rsync build-essential -y && wget http://production.cf.rubygems.org/rubygems/rubygems-1.3.7.tgz && tar xfz rubygems-1.3.7.tgz && cd rubygems-1.3.7 && ruby setup.rb && cd .. && rm -rf rubygems-1.3.7* && ln -s /usr/bin/gem1.8 /usr/bin/gem && gem install chef ohai --no-ri --no-rdoc})
     end
 
     def upload(root = "/")
@@ -26,17 +29,17 @@ module Solokit
       add_upload("#{solokit_path}/chef/*", "#{root}etc/chef") &&
       add_upload("chef/*", "#{root}etc/chef") &&
       add_upload("envs/#{@env}/chef/*", "#{root}etc/chef") &&
-      @ssh.run("rm -rf #{root}var/chef-solo #{root}etc/chef", false) &&
-      @ssh.rsync("#{temp_path}#{root}", root, true) &&
+      vm.run("rm -rf #{root}var/chef-solo #{root}etc/chef") &&
+      vm.upload("#{temp_path}#{root}", root) &&
       system("rm -rf #{temp_path}")
     end
 
     def run(debug = false, root = "/")
       puts "\n#{@name} (#{@env}): Running chef..."
       if debug
-        @ssh.run("#{custom_ruby_path(root)} chef-solo -c #{root}etc/chef/solo.rb -j #{root}etc/chef/#{@name}.json -l debug", false)
+        vm.run("#{custom_ruby_path(root)} chef-solo -c #{root}etc/chef/solo.rb -j #{root}etc/chef/#{@name}.json -l debug")
       else
-        @ssh.run("#{custom_ruby_path(root)} chef-solo -c #{root}etc/chef/solo.rb -j #{root}etc/chef/#{@name}.json", false)
+        vm.run("#{custom_ruby_path(root)} chef-solo -c #{root}etc/chef/solo.rb -j #{root}etc/chef/#{@name}.json")
       end
     end
 
@@ -49,6 +52,8 @@ module Solokit
 
     private
 
+    attr_reader :vm
+
     def temp_path
       "/tmp/solokit_upload/#{@env}-#{@name}-#{@ip}"
     end

data/lib/solokit/version.rb

@@ -1,3 +1,3 @@
 module Solokit
-  VERSION = "0.1.15"
+  VERSION = "0.1.16"
 end

data/lib/ssh_login.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.join(File.dirname(__FILE__), 'ssh.rb'))
+
+module Solokit
+  class SshLogin
+    def initialize(ip, user, debug_ssh)
+      @ssh = SSH.new(ip, user, debug_ssh)
+    end
+
+    def upload(path)
+      @ssh.rsync("#{temp_path}#{root}", root, true)
+    end
+
+    def run(command)
+      @ssh.run(command, false)
+    end
+  end
+end

data/script/test

@@ -0,0 +1 @@
+rspec $@

data/solokit.gemspec

@@ -19,4 +19,5 @@ Gem::Specification.new do |s|
 
   s.add_dependency "activesupport", ">= 3.0.0"
   s.add_development_dependency "bundler"
+  s.add_development_dependency "rspec"
 end

data/spec/solokit/chef_spec.rb

@@ -0,0 +1,18 @@
+require "solokit"
+
+# This is just the beginning of a test suite. Solokit was written without tests
+# when it was created long ago, but as we still use it I don't feel like adding
+# more to it without tests.
+
+describe Solokit::Chef, "#upload" do
+  it "note: incomplete test suite"
+
+  it "replaces any previous cookbooks on a server with the current set" do
+    # TODO: test the local interactions too
+    vm = double
+    expect(vm).to receive(:run).with("rm -rf /var/chef-solo /etc/chef").and_return(true)
+    expect(vm).to receive(:upload).with("/tmp/solokit_upload/test-name-ip/", "/").and_return(true)
+    chef = Solokit::Chef.new(:ip, :name, "test", false, "root", vm)
+    chef.upload
+  end
+end

metadata

@@ -1,63 +1,71 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: solokit
-version: !ruby/object:Gem::Version 
-  hash: 5
+version: !ruby/object:Gem::Version
+  version: 0.1.16
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 15
-  version: 0.1.15
 platform: ruby
-authors: 
-- "Joakim Kolsj\xC3\xB6"
+authors:
+- Joakim Kolsjö
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-11-27 00:00:00 +01:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2014-02-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: activesupport
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 3
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
   name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A toolkit for provisioning (ubuntu-)servers using chef-solo.
-email: 
+email:
 - joakim.kolsjo@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - CHANGELOG
@@ -107,41 +115,33 @@ files:
 - lib/solokit.rb
 - lib/solokit/version.rb
 - lib/ssh.rb
+- lib/ssh_login.rb
 - lib/user_json_generator.rb
+- script/test
 - solokit.gemspec
-has_rdoc: true
-homepage: ""
+- spec/solokit/chef_spec.rb
+homepage: ''
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.5.3
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A toolkit for provisioning (ubuntu-)servers using chef-solo.
 test_files: []
-