chake 0.0.1 → 0.1.0

data/.gitignore

@@ -15,3 +15,5 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+/examples/test/nodes.yaml
+/examples/test/.tmp

data/Rakefile

@@ -1 +1,7 @@
 require "bundler/gem_tasks"
+
+task :default do
+  sh 'rspec', '--color'
+end
+
+task :release => :default

data/chake.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.5"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
 
   spec.add_dependency "rake"
 end

data/examples/test/Rakefile

@@ -1,9 +1,5 @@
-begin
-  require 'chake'
-rescue LoadError
-  $: << '../../lib'
-  retry
-end
+$: << '../../lib' # this shouldn't be needed when you have chake installed
+require 'chake'
 
 desc 'removes everything'
 task :clean do

data/examples/test/cookbooks/example/files/default/test.asc

@@ -0,0 +1,18 @@
+-----BEGIN PGP MESSAGE-----
+Version: GnuPG v1
+
+hQIMA5A8ZkAWdYz7AQ//dgQhKXuGS0dY04TXa1cXEtOHYC64LLnoo+UZT/KgnkzI
+/IAgLFbAV0Fd9DGLK857qv9fWf/FB5b6loYLPOVEys0mb5aQrqPPFeKwTTXxTJdk
+Ts2NvSVfNZx95Igotm/vkKW6/dbGlDfQSOVQMzhvmKOMMpRP+ixqn+G/nwE/0wQG
+QXc3UPAe9gBFlI9GWLTafhftwrxXiYeNF8N03W9BUk1OiQqJUmDRK9ZjVe/vbEiZ
+iQ689MnF5l+/6gptU0j77QIqk5vEItkl7RISxOS8PDFI+926NV3fZUrRAlu2eDIy
+HNMGkcKTjGoPNrj/UzzmqjP3uNQtKoK559cul7uY44QmsEINoFP3HoAOHeVxm1pG
+6IG5EY6znwVEYTIVPK21NAPFpfk9yAB53sv6GrtOaYp8FFp+lLHJlPQcOOP51UV9
+GqiAuec7Lgr3iy1yaXIBHFlLG0lmZ1OI41zwqh+Z8EF1NC0gFPhGuOJqBGmBbOxy
+Wt1IFx1JUHi0f277us9pFbQlcUb8tgFZ0J69epBrod+xWaZQKFwLWsCTN66fKJfp
+rqBzRBcNDJwsKOd54v/Cmrws8bwnfB8iNZYuEQdEt9u5TGIZFl4R9k+/pydAQouP
+Z95g4vh2ST2ZEeblnbCc2TFY/7j2O+aXyBzX/4+/bM0kZbFjxCNuefU/v3ZnDwXS
+QAH+NPQ31IiqMmoETUqHzo1UI+hV9em81Llt2bsbgWULp84LEmzczbjAcMi2EWNt
+SzPyJzOLrqEvEYg2O/+bGho=
+=Y2iZ
+-----END PGP MESSAGE-----

data/examples/test/cookbooks/example/recipes/default.rb

@@ -0,0 +1,6 @@
+file '/tmp/chake.test' do
+  content   "It works!\n"
+  mode      '0644'
+  owner     'root'
+  group     'root'
+end

data/lib/chake.rb

@@ -5,21 +5,23 @@ require 'json'
 require 'tmpdir'
 require 'readline'
 
-$nodes_file = ENV['NODES'] || 'nodes.yaml'
-$node_data = File.exists?($nodes_file) && YAML.load_file($nodes_file) || {}
-$nodes = $node_data.keys
+require 'chake/node'
+
+nodes_file = ENV['NODES'] || 'nodes.yaml'
+node_data = File.exists?(nodes_file) && YAML.load_file(nodes_file) || {}
+$nodes = node_data.map { |node,data| Chake::Node.new(node, data) }
 
-$sample_nodes = <<EOF
-host1.my.tld:
-  run_list:
-    - recipe[myhost]
-EOF
 
 desc "Initializes current directory with sample structure"
 task :init do
   if !File.exists?('nodes.yaml')
     File.open('nodes.yaml', 'w') do |f|
-      f.write($sample_nodes)
+      sample_nodes = <<EOF
+host1.my.tld:
+  run_list:
+    - recipe[myhost]
+EOF
+      f.write(sample_nodes)
       puts "→ nodes.yaml"
     end
   end
@@ -45,7 +47,9 @@ end
 
 desc 'list nodes'
 task :nodes do
-  puts $nodes
+  $nodes.each do |node|
+    puts "%-40s %-5s\n" % [node.hostname, node.backend]
+  end
 end
 
 def encrypted_for(node)
@@ -71,23 +75,25 @@ end
 
 $nodes.each do |node|
 
-  desc "bootstrap #{node}"
-  task "bootstrap:#{node}" do
+  hostname = node.hostname
+
+  desc "bootstrap #{hostname}"
+  task "bootstrap:#{hostname}" do
     mkdir_p '.tmp', :verbose => false
-    config = '.tmp/' + node + '.json'
+    config = '.tmp/' + hostname + '.json'
 
     seen_before = File.exists?(config)
 
     # overwrite config with current contents
     File.open(config, 'w') do |f|
-      json_data = $node_data[node]
+      json_data = node.data
       f.write(JSON.dump(json_data))
       f.write("\n")
     end
 
     unless seen_before
       begin
-        sh "ssh root@#{node} 'apt-get -q -y install rsync chef'"
+        node.run_as_root('apt-get -q -y install rsync chef')
       rescue
         rm_f config
         raise
@@ -96,41 +102,40 @@ $nodes.each do |node|
 
   end
 
-  desc "upload data to #{node}"
-  task "upload:#{node}" do
-    encrypted = encrypted_for(node)
-    excludes = encrypted.values.map { |f| "--exclude #{f}" }.join(' ')
+  desc "upload data to #{hostname}"
+  task "upload:#{hostname}" do
+    encrypted = encrypted_for(hostname)
+    rsync_excludes = (encrypted.values + encrypted.keys).map { |f| ["--exclude", f] }.flatten
 
-    rsync = "rsync -avp --delete --exclude .git/ #{excludes}"
+    rsync = "rsync", "-avp", "--exclude", ".git/"
+    rsync_logging = Rake.application.options.silent && '--quiet' || '--verbose'
 
-    Dir.mktmpdir do |tmpdir|
-      sh "#{rsync} --quiet ./ #{tmpdir}/"
-      files = Dir.chdir(tmpdir) { Dir.glob("**/*").select { |f| !File.directory?(f) } }
-      if_files_changed(node, 'plain', files) do
-        rsync_logging = Rake.application.options.silent && '--quiet' || '--verbose'
-        sh "#{rsync} #{rsync_logging} ./ root@#{node}:/srv/chef/"
-      end
+    files = Dir.glob("**/*").select { |f| !File.directory?(f) } - encrypted.keys - encrypted.values
+    if_files_changed(hostname, 'plain', files) do
+      sh *rsync, '--delete', rsync_logging, *rsync_excludes, './', node.rsync_dest
     end
 
-    if_files_changed(node, 'enc', encrypted.keys) do
-      encrypted.each do |encrypted_file, target_file|
-        sh "gpg --quiet --batch --use-agent --decrypt #{encrypted_file} | ssh root@#{node} 'cat > /srv/chef/#{target_file}; chmod 600 /srv/chef/#{target_file}'"
+    if_files_changed(hostname, 'enc', encrypted.keys) do
+      Dir.mktmpdir do |tmpdir|
+        encrypted.each do |encrypted_file, target_file|
+          target = File.join(tmpdir, target_file)
+          mkdir_p(File.dirname(target))
+          sh 'gpg', '--quiet', '--batch', '--use-agent', '--output', target, '--decrypt', encrypted_file
+        end
+        sh *rsync, rsync_logging, tmpdir + '/', node.rsync_dest
       end
     end
   end
 
-  desc "converge #{node}"
-  task "converge:#{node}" => ["bootstrap:#{node}", "upload:#{node}"] do
+  desc "converge #{hostname}"
+  task "converge:#{hostname}" => ["bootstrap:#{hostname}", "upload:#{hostname}"] do
     chef_logging = Rake.application.options.silent && '-l fatal' || ''
-    sh "ssh root@#{node} 'chef-solo -c /srv/chef/config.rb #{chef_logging} -j /srv/chef/.tmp/#{node}.json'"
+    node.run_as_root "chef-solo -c #{node.path}/config.rb #{chef_logging} -j #{node.path}/.tmp/#{hostname}.json"
   end
 
-  desc "run a command on #{node}"
-  task "run:#{node}" => 'run_input' do
-    cmd = ['ssh', "root@#{node}", $cmd]
-    IO.popen(cmd).lines.each do |line|
-      puts "#{node}: #{line}"
-    end
+  desc "run a command on #{hostname}"
+  task "run:#{hostname}" => 'run_input' do
+    node.run($cmd)
   end
 end
 
@@ -139,15 +144,15 @@ task :run_input do
 end
 
 desc "upload to all nodes"
-task :upload => $nodes.map { |node| "upload:#{node}" }
+task :upload => $nodes.map { |node| "upload:#{node.hostname}" }
 
 desc "bootstrap all nodes"
-task :bootstrap => $nodes.map { |node| "bootstrap:#{node}" }
+task :bootstrap => $nodes.map { |node| "bootstrap:#{node.hostname}" }
 
 desc "converge all nodes (default)"
-task "converge" => $nodes.map { |node| "converge:#{node}" }
+task "converge" => $nodes.map { |node| "converge:#{node.hostname}" }
 
 task "run a command on all nodes"
-task :run => $nodes.map { |node| "run:#{node}" }
+task :run => $nodes.map { |node| "run:#{node.hostname}" }
 
 task :default => :converge

data/lib/chake/backend.rb

@@ -0,0 +1,46 @@
+module Chake
+
+  class Backend < Struct.new(:node)
+
+    def rsync_dest
+      node.path + '/'
+    end
+
+    def run(cmd)
+      IO.popen(command_runner + [cmd]).lines.each do |line|
+        puts [node.hostname, line.strip].join(': ')
+      end
+    end
+
+    def run_as_root(cmd)
+      if node.username == 'root'
+        run(cmd)
+      else
+        run('sudo ' + cmd)
+      end
+    end
+
+    def to_s
+      self.class.backend_name
+    end
+
+    def self.backend_name
+      name.split("::").last.downcase
+    end
+
+    def self.inherited(subclass)
+      @backends ||= []
+      @backends << subclass
+    end
+
+    def self.get(name)
+      backend = @backends.find { |b| b.backend_name == name }
+      backend || raise(ArgumentError.new("Invalid backend name: #{name}"))
+    end
+
+  end
+
+end
+
+require 'chake/backend/ssh'
+require 'chake/backend/local'

data/lib/chake/backend/local.rb

@@ -0,0 +1,15 @@
+module Chake
+
+  class Backend
+
+    class Local < Backend
+
+      def command_runner
+        ['sh', '-c']
+      end
+
+    end
+
+  end
+
+end

data/lib/chake/backend/ssh.rb

@@ -0,0 +1,25 @@
+module Chake
+
+  class Backend
+
+    class Ssh < Backend
+
+      def rsync_dest
+        [ssh_target, node.path + '/'].join(':')
+      end
+
+      def command_runner
+        ['ssh', ssh_target]
+      end
+
+      private
+
+      def ssh_target
+        [node.username, node.hostname].compact.join('@')
+      end
+
+    end
+
+  end
+
+end

data/lib/chake/node.rb

@@ -0,0 +1,44 @@
+require 'uri'
+require 'etc'
+require 'forwardable'
+
+require 'chake/backend'
+
+module Chake
+
+  class Node
+
+    extend Forwardable
+
+    attr_reader :hostname
+    attr_reader :username
+    attr_reader :path
+    attr_reader :data
+
+    def initialize(hostname, data = {})
+      uri = URI.parse(hostname)
+      if !uri.scheme && !uri.host && uri.path
+        uri = URI.parse("ssh://#{hostname}")
+      end
+      if uri.path.empty?
+        uri.path = nil
+      end
+
+      @backend_name = uri.scheme
+
+      @hostname = uri.hostname
+      @username = uri.user || Etc.getpwuid.name
+      @path = uri.path || "/tmp/chef.#{username}"
+      @data = data
+    end
+
+    def backend
+      @backend ||= Chake::Backend.get(@backend_name).new(self)
+    end
+
+    def_delegators :backend, :run, :run_as_root, :rsync_dest
+
+  end
+
+end
+

data/lib/chake/version.rb

@@ -1,3 +1,3 @@
 module Chake
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/spec/chake/backend/local_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe Chake::Backend::Local do
+
+  include_examples "Chake::Backend", Chake::Backend::Local
+
+  let(:node) { Chake::Node.new('local://myhost/srv/chef') }
+
+  it('runs commands with sh -c') { expect(backend.command_runner).to eq(['sh', '-c']) }
+
+  it('rsyncs locally') { expect(backend.rsync_dest).to eq('/srv/chef/') }
+end

data/spec/chake/backend/ssh_spec.rb

@@ -0,0 +1,13 @@
+require 'spec_helper'
+
+describe Chake::Backend::Ssh do
+
+  include_examples "Chake::Backend", Chake::Backend::Ssh, ->() {  }
+
+  let(:node) { Chake::Node.new('ssh://myuser@myhost/srv/chef') }
+
+  it('runs commands with ssh') { expect(backend.command_runner).to eq(['ssh', 'myuser@myhost']) }
+
+  it('rsyncs over ssh') { expect(backend.rsync_dest).to eq('myuser@myhost:/srv/chef/') }
+
+end

data/spec/chake/backend_spec.rb

@@ -0,0 +1,2 @@
+require 'chake/backend'
+

data/spec/chake/node_spec.rb

@@ -0,0 +1,50 @@
+require 'chake/node'
+
+describe Chake::Node do
+
+  before do
+    ent = double
+    ent.stub(:name).and_return('jonhdoe')
+    Etc.stub(:getpwuid).and_return(ent)
+  end
+
+  let(:simple) { Chake::Node.new('hostname') }
+  it('has a name') { expect(simple.hostname).to eq('hostname') }
+  it('uses ssh by default') { expect(simple.backend).to be_an_instance_of(Chake::Backend::Ssh) }
+  it('user current username by default') {
+    expect(simple.username).to eq('jonhdoe')
+  }
+  it('write to /tmp/chef.$username') {
+    expect(simple.path).to eq('/tmp/chef.jonhdoe')
+  }
+
+  let(:with_username) { Chake::Node.new('username@hostname') }
+  it('accepts username') { expect(with_username.username).to eq('username') }
+  it('uses ssh') { expect(with_username.backend).to be_an_instance_of(Chake::Backend::Ssh) }
+
+  let(:with_backend) { Chake::Node.new('local://hostname')}
+  it('accepts backend as URI scheme') { expect(with_backend.backend).to be_an_instance_of(Chake::Backend::Local) }
+
+  it('wont accept any backend') do
+    expect { Chake::Node.new('foobar://bazqux').backend }.to raise_error(ArgumentError)
+  end
+
+  let(:with_data) { Chake::Node.new('local://localhost', 'run_list' => ['recipe[common]']) }
+  it('takes data') do
+    expect(with_data.data).to be_a(Hash)
+  end
+
+  [:run, :run_as_root, :rsync_dest].each do |method|
+    it("delegates #{method} to backend") do
+      node = simple
+
+      backend = double
+      args = Object.new
+      node.stub(:backend).and_return(backend)
+
+      backend.should_receive(method).with(args)
+      node.send(method, args)
+    end
+  end
+
+end

data/spec/spec_helper.rb

@@ -0,0 +1,29 @@
+require 'chake/node'
+require 'chake/backend'
+
+
+shared_examples "Chake::Backend" do |backend_class|
+
+  let(:backend) { backend_class.new(node) }
+
+  it('runs commands') do
+    io = StringIO.new("line 1\nline 2\n")
+    IO.should_receive(:popen).with(backend.command_runner + ['something']).and_return(io)
+    backend.should_receive(:puts).with("myhost: line 1")
+    backend.should_receive(:puts).with("myhost: line 2")
+    backend.run('something')
+  end
+
+  it('runs as root') do
+    backend.should_receive(:run).with('sudo something')
+    backend.run_as_root('something')
+  end
+
+  it('does not use sudo if already root') do
+    backend.node.stub(:username).and_return('root')
+    backend.should_receive(:run).with('something')
+    backend.run_as_root('something')
+  end
+
+end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: chake
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-21 00:00:00.000000000 Z
+date: 2014-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -43,6 +43,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -74,13 +90,21 @@ files:
 - README.md
 - Rakefile
 - chake.gemspec
-- examples/test/.tmp/lvh.me.plain.sha1sum
 - examples/test/Rakefile
 - examples/test/config.rb
-- examples/test/cookbooks/myhost/recipes/default.rb
-- examples/test/nodes.yaml
+- examples/test/cookbooks/example/files/default/test.asc
+- examples/test/cookbooks/example/recipes/default.rb
 - lib/chake.rb
+- lib/chake/backend.rb
+- lib/chake/backend/local.rb
+- lib/chake/backend/ssh.rb
+- lib/chake/node.rb
 - lib/chake/version.rb
+- spec/chake/backend/local_spec.rb
+- spec/chake/backend/ssh_spec.rb
+- spec/chake/backend_spec.rb
+- spec/chake/node_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/terceiro/chake
 licenses:
 - MIT
@@ -106,4 +130,9 @@ rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Simple host management with chef and rake. No chef server required.
-test_files: []
+test_files:
+- spec/chake/backend/local_spec.rb
+- spec/chake/backend/ssh_spec.rb
+- spec/chake/backend_spec.rb
+- spec/chake/node_spec.rb
+- spec/spec_helper.rb

data/examples/test/.tmp/lvh.me.plain.sha1sum

@@ -1,4 +0,0 @@
-a70248580db38a6659bba1887c16ead12d8d2f6c  config.rb
-3f89ae2a25368bb08d8ecbe1b12028cdbd29bb23  nodes.yaml
-7e805ef45e1ee657afb162fd98e882caf9113bc0  cookbooks/myhost/recipes/default.rb
-ff86a66c0e8bb3dd6f526ab94ffd57f23c7153f1  Rakefile

data/examples/test/cookbooks/myhost/recipes/default.rb

@@ -1 +0,0 @@
-package 'openssh-server'

data/examples/test/nodes.yaml

@@ -1,3 +0,0 @@
-lvh.me:
-  run_list:
-    - recipe[myhost]