solokit 0.0.1 → 0.0.2

data/.gitignore

@@ -0,0 +1 @@
+pkg

data/Gemfile.lock

@@ -0,0 +1,17 @@
+PATH
+  remote: .
+  specs:
+    solokit (0.0.2)
+      activesupport (>= 3.0.0)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    activesupport (3.0.9)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  solokit!

data/Rakefile

@@ -0,0 +1,4 @@
+require 'bundler'
+
+Bundler::GemHelper.install_tasks
+

data/lib/chef.rb

@@ -1,57 +1,59 @@
 require File.expand_path(File.join(File.dirname(__FILE__), 'ssh.rb'))
 
-class Chef
-  def initialize(ip, name, env, debug_ssh, user = 'root')
-    @ip, @name, @env = ip, name, env
-    @ssh = SSH.new(ip, user, debug_ssh)
-  end
+module Solokit
+  class Chef
+    def initialize(ip, name, env, debug_ssh, user = 'root')
+      @ip, @name, @env = ip, name, env
+      @ssh = SSH.new(ip, user, debug_ssh)
+    end
 
-  def install
-    return true if installed?
-    puts "#{@name} (#{@env}): Installing chef..."
-    @ssh.run('export DEBIAN_FRONTEND=noninteractive; apt-get update && apt-get upgrade -y && apt-get install 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 install
+      return true if installed?
+      puts "#{@name} (#{@env}): Installing chef..."
+      @ssh.run('export DEBIAN_FRONTEND=noninteractive; apt-get update && apt-get upgrade -y && apt-get install 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 = "/")
-    @ssh.run("rm -rf #{root}var/chef-solo", false) &&
-    @ssh.run("rm -rf #{root}etc/chef", false) &&
-    upload_files("cookbooks/upstream/", "#{root}var/chef-solo/upstream-cookbooks") &&
-    upload_files("cookbooks/site/", "#{root}var/chef-solo/site-cookbooks") &&
-    (File.exists?("envs/#{@env}/cookbooks") ? 
-     upload_files("envs/#{@env}/cookbooks/*", "#{root}var/chef-solo/site-cookbooks") :
-     true) &&
-    upload_files("chef/*", "#{root}etc/chef") &&
-    upload_files("envs/#{@env}/chef/", "#{root}etc/chef") 
-  end
+    def upload(root = "/")
+      @ssh.run("rm -rf #{root}var/chef-solo", false) &&
+        @ssh.run("rm -rf #{root}etc/chef", false) &&
+        upload_files("cookbooks/upstream/", "#{root}var/chef-solo/upstream-cookbooks") &&
+        upload_files("cookbooks/site/", "#{root}var/chef-solo/site-cookbooks") &&
+        (File.exists?("envs/#{@env}/cookbooks") ? 
+         upload_files("envs/#{@env}/cookbooks/*", "#{root}var/chef-solo/site-cookbooks") :
+         true) &&
+           upload_files("chef/*", "#{root}etc/chef") &&
+           upload_files("envs/#{@env}/chef/", "#{root}etc/chef") 
+    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)
-    else
-      @ssh.run("#{custom_ruby_path(root)} chef-solo -c #{root}etc/chef/solo.rb -j #{root}etc/chef/#{@name}.json", false)
+    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)
+      else
+        @ssh.run("#{custom_ruby_path(root)} chef-solo -c #{root}etc/chef/solo.rb -j #{root}etc/chef/#{@name}.json", false)
+      end
     end
-  end
 
-  def self.provision!(env, host, config)
-    chef = Chef.new(host, "server", env, config.debug_ssh)
-    chef.install || raise("Chef install failed on #{env}")
-    chef.upload || raise("Chef upload failed on #{env}")
-    chef.run(config.debug_chef) || raise("Chef failed on #{env}")
-  end
+    def self.provision!(env, host, config)
+      chef = Chef.new(host, "server", env, config.debug_ssh)
+      chef.install || raise("Chef install failed on #{env}")
+      chef.upload || raise("Chef upload failed on #{env}")
+      chef.run(config.debug_chef) || raise("Chef failed on #{env}")
+    end
 
-  private
-  
-  def custom_ruby_path(root)
-    "PATH=\"#{root}ruby/bin:/sbin:$PATH\""
-  end
+    private
 
-  def upload_files(from, to)
-    @ssh.run("mkdir -p #{to}") &&
-    @ssh.rsync(from, to, true) 
-  end
+    def custom_ruby_path(root)
+      "PATH=\"#{root}ruby/bin:/sbin:$PATH\""
+    end
 
-  def installed?
-    @ssh.run('gem list chef | grep chef')
+    def upload_files(from, to)
+      @ssh.run("mkdir -p #{to}") &&
+        @ssh.rsync(from, to, true) 
+    end
+
+    def installed?
+      @ssh.run('gem list chef | grep chef')
+    end
   end
 end

data/lib/configuration.rb

@@ -1,19 +1,20 @@
 require 'ostruct'
 
-class Configuration < OpenStruct
-  def initialize(*envs)
-    shared_config = YAML.load_file("config.yml")
-    
-    config = shared_config
-    envs.each do |env|
-      env_config_file = "envs/#{env}/config.yml"
+module Solokit
+  class Configuration < OpenStruct
+    def initialize(*envs)
+      shared_config = YAML.load_file("config.yml")
 
-      config = File.exists?(env_config_file) ?
-               YAML.load_file(env_config_file).merge(config) :
-               config
-    end
+      config = shared_config
+      envs.each do |env|
+        env_config_file = "envs/#{env}/config.yml"
+
+        config = File.exists?(env_config_file) ?
+          YAML.load_file(env_config_file).merge(config) :
+          config
+      end
 
-    super(config)
+      super(config)
+    end
   end
 end
-

data/lib/solokit/version.rb

@@ -1,3 +1,3 @@
 module Solokit
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/ssh.rb

@@ -1,33 +1,34 @@
-class SSH
-  def initialize(ip, user, debug)
-    @ip, @user, @debug = ip, user, debug
-  end
+module Solokit
+  class SSH
+    def initialize(ip, user, debug)
+      @ip, @user, @debug = ip, user, debug
+    end
 
-  def run(command, quiet = true)
-    run_command("ssh #{ssh_opts} #{@user}@#{@ip} '#{command}' #{supress_output(quiet)}")
-  end
+    def run(command, quiet = true)
+      run_command("ssh #{ssh_opts} #{@user}@#{@ip} '#{command}' #{supress_output(quiet)}")
+    end
 
-  def rsync(source, target, quiet = false)
-    run_command("rsync -e 'ssh #{ssh_opts}' -az #{source} #{@user}@#{@ip}:#{target} #{supress_output(quiet)}")
-  end
+    def rsync(source, target, quiet = false)
+      run_command("rsync -e 'ssh #{ssh_opts}' -az #{source} #{@user}@#{@ip}:#{target} #{supress_output(quiet)}")
+    end
 
-  private
+    private
 
-  def supress_output(hide_stdout)
-    if @debug
-      ""
-    else
-      "#{hide_stdout ? '2> /dev/null 1> /dev/null' : '2> /dev/null'}"
+    def supress_output(hide_stdout)
+      if @debug
+        ""
+      else
+        "#{hide_stdout ? '2> /dev/null 1> /dev/null' : '2> /dev/null'}"
+      end
     end
-  end
 
-  def run_command(cmd)
-    puts "SSH | #{cmd}" if @debug
-    system(cmd)
-  end
+    def run_command(cmd)
+      puts "SSH | #{cmd}" if @debug
+      system(cmd)
+    end
 
-  def ssh_opts
-    "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+    def ssh_opts
+      "-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
+    end
   end
 end
-

data/lib/user_json_generator.rb

@@ -2,99 +2,100 @@ require 'yaml'
 require 'active_support'
 require 'active_support/json/encoding'
 
-class UserJsonGenerator
+module Solokit
+  class UserJsonGenerator
 
-  def initialize(key_path, env, opts = {})
-    @key_path = key_path
+    def initialize(key_path, env, opts = {})
+      @key_path = key_path
 
-    data = YAML.load_file("users.yml")
+      data = YAML.load_file("users.yml")
 
-    @default_hash = data["default_hash"]
-    @users = data["users"]
-    @groups = data["groups"]
-    @env = data["envs"][env]
-    @opts = { :home => "/home" }.merge(opts)
-  end
+      @default_hash = data["default_hash"]
+      @users = data["users"]
+      @groups = data["groups"]
+      @env = data["envs"][env]
+      @opts = { :home => "/home" }.merge(opts)
+    end
 
-  def generate(target)
-    if ENV['DEBUG_USER_JSON']
-      require 'pp'
-      ::PP.pp generate_json
-      exit 0
+    def generate(target)
+      if ENV['DEBUG_USER_JSON']
+        require 'pp'
+        ::PP.pp generate_json
+        exit 0
+      end
+      File.open(target, 'w') { |f| f.write(generate_json) }
     end
-    File.open(target, 'w') { |f| f.write(generate_json) }
-  end
 
-  def self.generate!(env, opts = {})
-    UserJsonGenerator.new("public_keys", env, opts).generate("envs/#{env}/chef/roles/users.json")
-  end
+    def self.generate!(env, opts = {})
+      UserJsonGenerator.new("public_keys", env, opts).generate("envs/#{env}/chef/roles/users.json")
+    end
 
-  private
+    private
 
-  def generate_json
-    {
-      :name => "Users",
-      :chef_type => "role",
-      :json_class => "Chef::Role",
-      :override_attributes => {
+    def generate_json
+      {
+        :name => "Users",
+        :chef_type => "role",
+        :json_class => "Chef::Role",
+        :override_attributes => {
         :users => env_users.inject({}) { |h, user|
-          h[user] = {
-              :password => (@users[user] || {})["hash"] || @default_hash,
-              :home => (user == 'root' ? '/root' : [ @opts[:home], user ].join('/')),
-              :hidden_home => !!(@users[user] || {})["hidden_home"]
-          }; h
-        },
+        h[user] = {
+          :password => (@users[user] || {})["hash"] || @default_hash,
+          :home => (user == 'root' ? '/root' : [ @opts[:home], user ].join('/')),
+          :hidden_home => !!(@users[user] || {})["hidden_home"]
+        }; h
+      },
         :ssh_keys => env_users.inject({}) { |h, user|
-          h[user] = get_keys(user); h
-        },
+        h[user] = get_keys(user); h
+      },
         :authorization => {
-          :sudo => { :users => env_sudo_users }
-        }
+        :sudo => { :users => env_sudo_users }
+      }
       },
-      :run_list => [ "recipe[users]", "recipe[sudo]" ]
-    }.send(ENV['DEBUG_USER_JSON'] ? 'to_hash' : 'to_json')
-    #.gsub(/\{/, "{\n").gsub(/\}/, "}\n")
-  end
+        :run_list => [ "recipe[users]", "recipe[sudo]" ]
+      }.send(ENV['DEBUG_USER_JSON'] ? 'to_hash' : 'to_json')
+      #.gsub(/\{/, "{\n").gsub(/\}/, "}\n")
+    end
 
-  def env_users
-    resolve_users(@env["users"].split)
-  end
+    def env_users
+      resolve_users(@env["users"].split)
+    end
 
-  def env_sudo_users
-    @env["sudo"] && resolve_users(@env["sudo"].split)
-  end
+    def env_sudo_users
+      @env["sudo"] && resolve_users(@env["sudo"].split)
+    end
 
-  def resolve_users(list)
-    list.map { |item|
-      if item.include?("group")
-        fetch_group_users(item)
-      else
-        item
-      end
-    }.flatten
-  end
+    def resolve_users(list)
+      list.map { |item|
+        if item.include?("group")
+          fetch_group_users(item)
+        else
+          item
+        end
+      }.flatten
+    end
 
-  def get_keys(user)
-    (@users[user] || {})["keys"].to_s.split.map do |key_name|
-      if key_name.include?("group")
-        keys_from_group(key_name)
-      else
-        key_file = "#{@key_path}/#{key_name}.pub"
-        if File.exists?(key_file)
-          File.read(key_file).chomp
+    def get_keys(user)
+      (@users[user] || {})["keys"].to_s.split.map do |key_name|
+        if key_name.include?("group")
+          keys_from_group(key_name)
         else
-          raise "Could not find key file: #{key_file}."
+          key_file = "#{@key_path}/#{key_name}.pub"
+          if File.exists?(key_file)
+            File.read(key_file).chomp
+          else
+            raise "Could not find key file: #{key_file}."
+          end
         end
-      end
-    end.join("\n")
-  end
+      end.join("\n")
+    end
 
-  def fetch_group_users(name)
-    @groups[name.split('/').last].split
-  end
+    def fetch_group_users(name)
+      @groups[name.split('/').last].split
+    end
 
-  def keys_from_group(name)
-    @groups[name.split("/").last].split.map { |user| get_keys(user) }
+    def keys_from_group(name)
+      @groups[name.split("/").last].split.map { |user| get_keys(user) }
+    end
   end
 end
-

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: solokit
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 27
   prerelease: 
   segments: 
   - 0
   - 0
-  - 1
-  version: 0.0.1
+  - 2
+  version: 0.0.2
 platform: ruby
 authors: 
 - "Joakim Kolsj\xC3\xB6"
@@ -58,10 +58,13 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
+- .gitignore
 - .rvmrc
 - Gemfile
+- Gemfile.lock
 - LICENCE
 - README
+- Rakefile
 - lib/chef.rb
 - lib/configuration.rb
 - lib/solokit.rb