runpuppet 1.0.0.rc1 → 1.0.0.rc2

data/Gemfile

@@ -5,6 +5,7 @@ source "http://rubygems.org"
 
 gem 'rest-client'
 gem 'facter'
+gem 'dim'
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do

data/Gemfile.lock

@@ -1,6 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    dim (1.2.2)
     facter (1.6.14)
     git (1.2.5)
     jeweler (1.8.4)
@@ -25,6 +26,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 1.2.0)
+  dim
   facter
   jeweler
   minitest (= 4.1.0)

data/README.rdoc

@@ -11,6 +11,28 @@ cat /etc/runpuppet.yml:
     lock_file: /tmp/runpuppet.lock
 
 
+### Run tests
+
+   sh/test
+
+
+#### Start console
+
+   sh/c
+
+#### Playing in console
+
+   @ctx = Runpuppet.setup_context({})
+
+   # client
+   @ctx.client
+
+   # config
+   @ctx.config
+
+   # agent ### HTTP agent
+   @ctx.agent
+
 
 
 This is the companion for our puppet_controller, a light-weight web-service to coordinate local puppet runs on servers.
@@ -27,6 +49,6 @@ This is the companion for our puppet_controller, a light-weight web-service to c
 
 == Copyright
 
-Copyright (c) 2011 Roman Heinrich. See LICENSE.txt for
+Copyright (c) 2012 Roman Heinrich. See LICENSE.txt for
 further details.
 

data/Rakefile

@@ -32,7 +32,7 @@ Rake::TestTask.new do |t|
 end
 
 
-require 'rake/rdoctask'
+require 'rdoc/task'
 Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 

data/VERSION

@@ -1 +1 @@
-0.5.20
+1.0.0.rc2

data/bin/runpuppet

@@ -20,17 +20,19 @@ BANNER
 
   opts.on("-h", "--help","Show this.") { puts opts; exit }
   opts.on("--readme", 'Show Readme'){ puts File.read(File.join(File.dirname(__FILE__), '..', 'README.rdoc')); exit }
-  opts.on('-v', '--version','Show Version'){ puts Runpuppet::VERSION; exit}
-  opts.on('--try','Runs only if selected on puppet_controller'){ options[:try] = true }
-  opts.on('-f', '--facts','Report facts'){ options[:facts] = true }
-  opts.on('--verbose','Verbose Output'){ options[:verbose] = true }
+  opts.on('--version', 'Show Version'){ puts Runpuppet::VERSION; exit}
+  opts.on('--try', 'Runs only if selected on puppet_controller'){ options[:try] = true }
+  opts.on('-f', '--facts', 'Report facts'){ options[:facts] = true }
+  opts.on('-v', '--verbose', 'Execute Verbose Command'){ options[:verbose] = true }
+  opts.on('-d', '--debug', 'With debug output'){ options[:debug] = true }
   opts.on('-b x', '--branch x', 'Run this branch') do |branch|
     options[:branch] = branch
   end
 end.parse!
 
+PuppetContext = Runpuppet.setup_context(options)
 if options[:facts]
-  Runpuppet.report_facts
+  PuppetContext.client.report_facts
 else
-  Runpuppet.run(options)
-end
+  PuppetContext.client.run
+end

data/lib/ext/core.rb

@@ -0,0 +1,8 @@
+class Array
+  # [[1,2]] => {1=>2}
+  def to_hash
+    hash = {}
+    each {|k,v| hash[k]=v}
+    hash
+  end
+end

data/lib/runpuppet.rb

@@ -2,151 +2,41 @@ require 'open-uri'
 require 'socket'
 require 'yaml'
 require 'rest-client'
-require 'core-ext'
-
-STDOUT.sync = true
-
-class Runpuppet
-  def self.with_lock(lock_file)
-    recently_locked = (File.exists?(lock_file) and File.mtime(lock_file) > Time.now - 15*60)
-
-    if recently_locked
-      puts "can not run, lockfile #{lock_file} exists"
-    else
-      begin
-        `touch #{lock_file}`
-        yield
-      ensure
-        `rm #{lock_file}`
-      end
-    end
-  end
-
-  # simplified copy of rake`s sh
-  def self.sh(cmd)
-    puts cmd
-    IO.popen(cmd) do |pipe|
-      while str = pipe.gets
-        puts str
-      end
-    end
-    $?.success?
-  end
-
-
-  def self.get(path, options={})
-    path += (path.include?('?') ? '&' : '?')
-    path += "hostname=#{Socket.gethostname}&ip=#{Config.local_ip}"
-    begin
-      url = Config.puppet_controller_url + path
-      puts "Getting #{url}" if options[:verbose]
-      RestClient.get(url)
-    rescue Exception => e
-      puts e.inspect
-      puts "WARNING: error connecting in GET (PuppetMaster)"
-    end
-  end
-
-
-  def self.post(path, params)
-    params[:hostname] = Socket.gethostname
-    params[:ip] = Config.local_ip
-    begin
-      RestClient.post "#{Config.puppet_controller_url}/puppet/#{path}", params
-    rescue Exception => e
-      puts e.inspect
-      puts "WARNING: error connecting in POST (PuppetMaster)"
-    end
-  end
+require 'dim'
 
+require 'ext/core'
+require 'runpuppet/config'
+require 'runpuppet/client'
+require 'runpuppet/agent'
+require 'runpuppet/logger'
 
-  def self.run(options={})
-    with_lock(Config.lock_file) do
-      time = Time.now.utc.strftime("%Y-%m-%d %H:%M:%S")
-
-      todo, branch = get("/puppet/run", options).split('-') rescue []
-      puts "got #{todo} with branch #{branch}" if options[:verbose]
-      branch ||= (options[:branch] || Config.default_branch)
-      if todo == 'run' or !options[:try] # try allows not running
-        get '/puppet/status?status=started', options
-        cmd = Config.command.gsub('@@branch@@', branch)
-        puts "#{time}: run #{branch}"
-
-        if sh(cmd)
-          get '/puppet/status?status=finished', options
-        else
-          get '/puppet/status?status=error', options
-          exit 2
-        end
-      else
-        puts "#{time}: nothing to do"
-      end
-    end
-  end
-
-  def self.report_facts(options={})
-    require 'facter/application'
-    facts = Facter::Application.run([])
-    post('facts', :facts => facts.to_hash)
-  end
-
-
-  class Config
-    def self.config
-      home = File.expand_path('~')
-      ["#{home}/.runpuppet.yml", '/etc/runpuppet.yml'].each do |file|
-        return YAML.load(File.read(file)) if File.exist?(file)
-      end
-      raise "No runpuppet.yml found in /etc or #{home}"
-    end
-
-    def self.puppet_controller_url
-      config['puppet_controller_url'].sub(%r{/$},'')
-    end
+STDOUT.sync = true
 
-    def self.puppet_controller_auth
-      extract_auth_from_url!(config['puppet_controller_url'])
-    end
 
-    def self.extract_auth_from_url!(url)
-      url.sub!(%r{//(.*?):(.*?)@}, '//')
-      auth = [$1, $2].compact
-      auth.empty? ? nil : auth
-    end
+module Runpuppet
+  def self.setup_context(options={})
+    ctx = Dim::Container.new
 
-    def self.lock_file
-      config['lock_file'] || '/tmp/runpuppet.lock'
+    ctx.register(:run_options) do
+      options
     end
 
-    def self.command
-      config['command'] ||  "cd /etc/puppet/repo && git fetch && git checkout -f origin/@@branch@@ && puppet -v --debug --logdest console --modulepath /etc/puppet/repo/modules /etc/puppet/repo/manifests/site.pp"
+    ctx.register(:config) do
+      Runpuppet::Config.find_system_config
     end
 
-    def self.default_branch
-      config['branch'] || 'master'
+    ctx.register(:client) do |context|
+      Runpuppet::Client.new(context)
     end
 
-    def self.local_ip
-      if is_ec2?
-        require 'facter'
-        require 'facter/ec2'
-        ip = Facter.value("ec2_public_ipv4")
-      elsif config['local_ip_interface']
-        parse_local_ip_from_interface
-      else
-        config['local_ip'] or %x(ifconfig)[/192.168.\d+.\d+/] or %x(ifconfig)[/10.10.\d+.\d+/]
-      end
+    ctx.register(:agent) do |context|
+      Runpuppet::Agent.new(context)
     end
 
-
-    def self.parse_local_ip_from_interface
-      # %x(ifconfig #{config['local_ip_interface']}).lines.grep(/inet addr/).first.match(/addr:(\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?/)
-      %x(ip addr list #{config['local_ip_interface']}).match(/inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?/)
-      return $1
+    ctx.register(:logger) do
+      Runpuppet::Logger
     end
 
-    def self.is_ec2?
-      %x(arp -n -i eth0) =~ /fe:ff:ff:ff:ff/
-    end
+    return ctx
   end
 end

data/lib/runpuppet/agent.rb

@@ -0,0 +1,77 @@
+### http client
+module Runpuppet
+  class Agent
+    attr_accessor :config
+    attr_accessor :run_options
+    def initialize(context)
+      @config      = context.config
+      @run_options = context.run_options
+    end
+
+##### puppet
+
+    def check_status
+      action, branch = get("/puppet/run", @run_options).split('-') rescue []
+      branch ||= (run_options[:branch] || config.default_branch)
+      return action, branch
+    end
+
+    def report_start
+      get '/puppet/status?status=started'
+    end
+
+    def report_success
+      get '/puppet/status?status=finished'
+    end
+
+    def report_failure
+      get '/puppet/status?status=error'
+    end
+
+    def report_facts
+      require 'facter/application'
+      facts = Facter::Application.run([])
+      post('/puppet/facts', :facts => facts.to_hash)
+    end
+
+#### base
+
+    def get(path)
+      begin
+        url = append_params_to_url(base_url(path))
+        puts "Getting #{url}" if run_options[:verbose]
+        result = RestClient.get(url)
+        puts "got #{result}" if run_options[:verbose]
+      rescue Exception => e
+        puts e.inspect
+        puts "WARNING: error connecting in GET (PuppetMaster)"
+      end
+    end
+
+    def post(path, params)
+      begin
+        RestClient.post base_url(path), append_params_to_post(params)
+      rescue Exception => e
+        puts e.inspect
+        puts "WARNING: error connecting in POST (PuppetMaster)"
+      end
+    end
+
+    def append_params_to_post(params)
+      params            = params.dup
+      params[:hostname] = config.hostname
+      params[:ip]       = config.local_ip
+      return params
+    end
+
+    def append_params_to_url(url)
+      url += (url.include?('?') ? '&' : '?')
+      url += "hostname=#{config.hostname}&ip=#{config.local_ip}"
+      url
+    end
+
+    def base_url(path)
+      "#{config.puppet_controller_url.gsub(/\/$/, '')}/#{path.gsub(/^\//, '')}"
+    end
+  end
+end

data/lib/runpuppet/client.rb

@@ -0,0 +1,76 @@
+module Runpuppet
+  class Client
+    attr_accessor :config
+    attr_accessor :run_options
+    attr_accessor :agent
+    attr_accessor :logger
+    def initialize(context)
+      @config      = context.config
+      @run_options = context.run_options
+      @agent       = context.agent
+    end
+
+    def run
+      with_lock(config.lock_file) do
+        action, branch = agent.check_status
+        if should_run?(action)
+          agent.report_start
+          log "run #{branch}"
+
+          if sh(run_command(branch))
+            agent.report_success
+          else
+            agent.report_failure
+            exit 2
+          end
+        else
+          log "nothing to do"
+        end
+      end
+    end
+
+    def run_command(branch)
+      cmd = if run_options[:verbose]
+        config.verbose_command
+      else
+        config.command
+      end
+      cmd.gsub('@@branch@@', branch)
+    end
+
+    def should_run?(action)
+      ## always run if started without --try
+      (!run_options[:try] or action == 'run')
+    end
+
+    def with_lock(lock_file)
+      recently_locked = (File.exists?(lock_file) and File.mtime(lock_file) > Time.now - 15*60)
+
+      if recently_locked
+        log "can not run, lockfile #{lock_file} exists"
+      else
+        begin
+          `touch #{lock_file}`
+          yield
+        ensure
+          `rm #{lock_file}`
+        end
+      end
+    end
+
+    # simplified copy of rake`s sh
+    def sh(cmd)
+      puts cmd
+      IO.popen(cmd) do |pipe|
+        while str = pipe.gets
+          puts str
+        end
+      end
+      $?.success?
+    end
+
+    def log(msg)
+      logger.log(msg)
+    end
+  end
+end

data/lib/runpuppet/config.rb

@@ -0,0 +1,94 @@
+module Runpuppet
+  class Config
+    attr_accessor :config_path
+    attr_accessor :data
+    def initialize(config_path)
+      @config_path = config_path
+      load_data
+    end
+
+
+    def load_data
+      raise "No runpuppet.yml found in #{config_path}" unless File.exist?(config_path)
+      @data = YAML.load(File.read(config_path))
+    end
+
+    def self.find_system_config
+      home = File.expand_path('~')
+      pathes = ["#{home}/.runpuppet.yml", '/etc/runpuppet.yml']
+      pathes.each do |file|
+        return Runpuppet::Config.new(file) if File.exist?(file)
+      end
+      puts "No runpuppet.yml found in #{pathes.join(' or ')}"
+      exit
+    end
+
+    def puppet_controller_url
+      data['puppet_controller_url'].sub(%r{/$},'')
+    end
+
+    def puppet_controller_auth
+      extract_auth_from_url!(puppet_controller_url)
+    end
+
+    def extract_auth_from_url!(url)
+      url.sub!(%r{//(.*?):(.*?)@}, '//')
+      auth = [$1, $2].compact
+      auth.empty? ? nil : auth
+    end
+
+    def lock_file
+      data['lock_file'] || '/tmp/runpuppet.lock'
+    end
+
+    def command
+      # "cd /etc/puppet/repo && git fetch && git checkout -f origin/@@branch@@ && puppet -v --debug --logdest console --modulepath /etc/puppet/repo/modules /etc/puppet/repo/manifests/site.pp"
+      data['command']
+    end
+
+    def verbose_command
+      unless data['verbose_command']
+        puts "No verbose_command param in #{config_path} found! using normal command."
+        return self.command
+      end
+      data['verbose_command']
+    end
+
+    def default_branch
+      data['branch'] || 'master'
+    end
+
+    def local_ip
+      if is_ec2?
+        require 'facter'
+        require 'facter/ec2'
+        ip = Facter.value("ec2_public_ipv4")
+      elsif data['local_ip_interface']
+        parse_local_ip_from_interface
+      else
+        ifconfig = read_shell('ifconfig')
+        data['local_ip'] or
+          ifconfig[/192.168.\d+.\d+/] or
+          ifconfig[/10.10.\d+.\d+/]
+      end
+    end
+
+    def hostname
+      Socket.gethostname
+    end
+
+    def parse_local_ip_from_interface
+      cmd = "ip addr list #{data['local_ip_interface']}"
+      read_shell(cmd).match(/inet (\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3})?/)
+      return $1
+    end
+
+    def is_ec2?
+      read_shell('arp -n -i eth0') =~ /fe:ff:ff:ff:ff/
+    end
+
+    def read_shell(cmd)
+      %x(#{cmd})
+    end
+  end
+end

data/lib/runpuppet/logger.rb

@@ -0,0 +1,6 @@
+class Logger
+  def self.log(msg)
+    time = Time.now.utc.strftime("%Y-%m-%d %H:%M:%S")
+    puts "#{time}: #{msg}"
+  end
+end

data/runpuppet.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "runpuppet"
-  s.version = "1.0.0.rc1"
+  s.version = "1.0.0.rc2"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Roman Heinrich"]
@@ -26,8 +26,23 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "bin/runpuppet",
+    "lib/ext/core.rb",
     "lib/runpuppet.rb",
+    "lib/runpuppet/agent.rb",
+    "lib/runpuppet/client.rb",
+    "lib/runpuppet/config.rb",
+    "lib/runpuppet/logger.rb",
     "runpuppet.gemspec",
+    "sh/c",
+    "sh/console.rb",
+    "sh/test",
+    "test/agent_test.rb",
+    "test/binary_test.rb",
+    "test/client_test.rb",
+    "test/config_test.rb",
+    "test/fixtures/runpuppet.yml",
+    "test/fixtures/shell/arp_eth0.txt",
+    "test/fixtures/shell/ip_addr_list_eth0.txt",
     "test/helper.rb"
   ]
   s.homepage = "http://github.com/dawanda/runpuppet"

data/sh/c

@@ -0,0 +1 @@
+irb -r sh/console.rb

data/sh/console.rb

@@ -0,0 +1,14 @@
+
+require 'rubygems'
+require 'bundler'
+begin
+  Bundler.setup(:default, :development)
+rescue Bundler::BundlerError => e
+  $stderr.puts e.message
+  $stderr.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.dirname(__FILE__))
+require 'runpuppet'

data/sh/test

@@ -0,0 +1 @@
+rake test

data/test/agent_test.rb

@@ -0,0 +1,49 @@
+require 'test/helper'
+
+describe "Runpuppet::Agent" do
+  before do
+    @agent = TestContext.agent
+  end
+
+  describe :check_status do
+    it "returns the action for puppet and branch" do
+      @agent.stubs(:get).returns('run-master')
+      @agent.check_status.must_equal ["run", "master"]
+    end
+  end
+
+  describe :base_url do
+    it 'works' do
+      @agent.base_url('/action').must_equal "http://user:pass@puppet.example.com/action"
+    end
+  end
+
+  describe "URL manipulation" do
+    before do
+      TestContext.config.stubs(:local_ip).returns('10.10.10.10')
+      TestContext.config.stubs(:hostname).returns('example-vm')
+    end
+
+
+    describe :append_params_to_post do
+      it  "adds hostname and local ip to params" do
+        params = {}
+        new_params = @agent.append_params_to_post(params)
+        new_params[:hostname].must_equal 'example-vm'
+        new_params[:ip].must_equal '10.10.10.10'
+      end
+    end
+
+    describe :append_params_to_url do
+      it "adds ip and hostname to url" do
+        new_url = @agent.append_params_to_url('/action')
+        new_url.must_equal "/action?hostname=example-vm&ip=10.10.10.10"
+      end
+
+      it "appends to existing params, if needed" do
+        new_url = @agent.append_params_to_url('/action?some_funny_param=1')
+        new_url.must_equal "/action?some_funny_param=1&hostname=example-vm&ip=10.10.10.10"
+      end
+    end
+  end
+end

data/test/binary_test.rb

@@ -0,0 +1,7 @@
+require 'test/helper'
+describe "Runpuppet" do
+  it "has no syntax errors" do
+    a = %x(./bin/runpuppet -h 2>&1)
+    a.must_match 'Runpuppet for puppet_controller'
+  end
+end

data/test/client_test.rb

@@ -0,0 +1,37 @@
+require 'test/helper'
+
+describe "Client" do
+  before do
+    @ctx   = Dim::Container.new(TestContext)
+  end
+
+  describe :run_command do
+    it  "without --verbose param" do
+      cmd = "cd /etc/puppet/repo && git fetch && git checkout -f origin/feature && puppet apply /etc/puppet/repo/manifests/site.pp"
+      @ctx.client.run_command('feature').must_equal cmd
+    end
+
+    it  "with --verbose param" do
+      @ctx.register(:run_options){ {:verbose => true} }
+      cmd = "cd /etc/puppet/repo && git fetch && git checkout -f origin/feature && /etc/puppet/repo/bin/prepare_environment.rb && puppet apply -v /etc/puppet/repo/manifests/site.pp"
+      @ctx.client.run_command('feature').must_equal cmd
+    end
+  end
+
+  describe :should_run? do
+    it "always runs without --try option" do
+      @ctx.register(:run_options){ {:try => false} }
+      @ctx.client.should_run?('branch_does_not_matter').must_equal true
+    end
+
+    it "runs with --try option only for 'run' action" do
+      @ctx.register(:run_options){ {:try => true} }
+      @ctx.client.should_run?('run').must_equal true
+    end
+
+    it "does not run with --try option, if not 'run' action" do
+      @ctx.register(:run_options){ {:try => true} }
+      @ctx.client.should_run?('some_random_action').must_equal false
+    end
+  end
+end

data/test/config_test.rb

@@ -0,0 +1,89 @@
+require 'test/helper'
+
+describe 'Config' do
+  def shell_fixture(path)
+    File.read("test/fixtures/shell/#{path}").strip
+  end
+
+  before do
+    @config  = TestContext.config
+  end
+
+  it "reports facts" do
+    ec2_facts = [["architecture", "x86_64"], ["arp", "fe:ff:ff:ff:ff:ff"], ["arp_eth0", "fe:ff:ff:ff:ff:ff"], ["domain", "eu-west-1.compute.internal"], ["ec2_ami_id", "ami-7acafc0e"], ["ec2_ami_launch_index", "0"], ["ec2_ami_manifest_path", "(unknown)"], ["ec2_block_device_mapping_ami", "/dev/sda1"], ["ec2_block_device_mapping_ephemeral0", "/dev/sdb"], ["ec2_block_device_mapping_root", "/dev/sda1"], ["ec2_hostname", "ip-10-234-151-254.eu-west-1.compute.internal"], ["ec2_instance_id", "i-cc511dba"], ["ec2_instance_type", "t1.micro"], ["ec2_kernel_id", "aki-4feec43b"], ["ec2_local_hostname", "ip-10-234-151-254.eu-west-1.compute.internal"], ["ec2_local_ipv4", "10.234.151.254"], ["ec2_placement_availability_zone", "eu-west-1a"], ["ec2_profile", "default-paravirtual"], ["ec2_public_hostname", "ec2-46-137-37-20.eu-west-1.compute.amazonaws.com"], ["ec2_public_ipv4", "46.137.37.20"], ["ec2_public_keys_0_openssh_key", "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCn6ld1os3dZkdIjJ0zqOUrZWi9zODc2WEaonlPRjyxqhX5nDYJMFrvKRXAIi41TKxwGXzor55gbLb5GnLDFMHEZwtye9MH4n98DdSFu8Nxb9wZgT1xZ+UE/9+GKVAJq77yIWP5qe6iJe80JQAaO/WbinMoqBZ9YOF2MgPNIUoP/bPHZ6Fb+/3Nv1NV+aAMB2vqOlrujcGkI49vFmH6qbNKgAAyuakGSIlBab4PBPti3B+tOoLeimqL4H8iAQAWZCjinG12oUTkl07ZpU1waFUTDaKv4QvwFU4bGgZYk7hysAjE7A8NxI7ApEenbxySnkjew4zQlmPmV21u16E3kGYx node-autoscaling"], ["ec2_reservation_id", "r-7c31b10a"], ["ec2_security_groups", "default"], ["facterversion", "1.5.9"], ["fqdn", "ip-10-234-151-254.eu-west-1.compute.internal"], ["hardwareisa", "unknown"], ["hardwaremodel", "x86_64"], ["hostname", "ip-10-234-151-254"], ["id", "root"], ["interfaces", "dummy0,eql,eth0,ifb0,ifb1,lo"], ["ipaddress", "10.234.151.254"], ["ipaddress_eth0", "10.234.151.254"], ["ipaddress_lo", "127.0.0.1"], ["is_virtual", "true"], ["kernel", "Linux"], ["kernelmajversion", "2.6"], ["kernelrelease", "2.6.32-314-ec2"], ["kernelversion", "2.6.32"], ["lib", "/var/lib/puppet/facts"], ["lsbdistcodename", "lucid"], ["lsbdistdescription", "Ubuntu 10.04.2 LTS"], ["lsbdistid", "Ubuntu"], ["lsbdistrelease", "10.04"], ["lsbmajdistrelease", "10"], ["macaddress", "26:73:1b:a3:48:2a"], ["macaddress_dummy0", "26:73:1b:a3:48:2a"], ["macaddress_eth0", "12:31:3b:05:94:10"], ["macaddress_ifb0", "5e:5b:e7:92:26:c2"], ["macaddress_ifb1", "72:50:ad:1d:a1:0f"], ["memoryfree", "430.29 MB"], ["memorysize", "635.17 MB"], ["netmask", "255.255.254.0"], ["netmask_eth0", "255.255.254.0"], ["netmask_lo", "255.0.0.0"], ["network_eth0", "10.234.150.0"], ["network_lo", "127.0.0.0"], ["operatingsystem", "Ubuntu"], ["operatingsystemrelease", "10.04"], ["path", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/rvm/bin"], ["physicalprocessorcount", "1"], ["processor0", "Intel(R) Xeon(R) CPU           E5430  @ 2.66GHz"], ["processorcount", "1"], ["ps", "ps -ef"], ["puppetversion", "2.6.7"], ["rubysitedir", "/usr/local/lib/ruby/site_ruby/1.8"], ["rubyversion", "1.8.7"], ["selinux", "false"], ["sshdsakey", "AAAAB3NzaC1kc3MAAACBAM2/DHTO3olTFG6lmWXNJcEYKZtFylFWCLJomNEaMMkf7qEtCLSPVWdhgYKHmk/UBPrpuzWrapVa1/eap77CNgQ6e8LmKdcgkCVcuKSLqtm+e989lb9RrcIUYYd4UXIZbLPKF3z3AOmESxikaiQs9M8x4Jn5kmpPb6fixSvOi577AAAAFQDAQMxsywSbD3W28MCI3kfrbKhEPwAAAIBm5HQwsY8VZnfLgWdkpZfcDv2V/9U+0+Atd6O37wpmF4HjIqbIbTJ1ABCXhLgo5oX2YVsRWfVLLxsmgxPoF5CLBNPQcFhNldto4H8sGkcbNFU8oBEiOgnZ6ZEax/Ooe/bO7wR+dz0F5u9IuMj4QK1GWuiAUr7U8E9Ithhe3DVq1QAAAIB3xFxOwbewB9YaeajoTfJDZzt/ovgSD3V4YYgX7mRG8Zv5UW2LduLgifwBJLWVt/Qp44STI1wON2OFRNDvhIH82+5iW3m5ifIy5c8ZviupZVpYy2adw/Ay3+bP/w0TtosmlzyWW7tj2jXVTc79ul3y9uXfZcQw8EB0ISbafy6+2Q=="], ["sshrsakey", "AAAAB3NzaC1yc2EAAAABIwAAAQEAtdvq2CjLz74rL1peJiZakeZtgeJ6lQ1vzCHseSkB3kjsPBMckz9RIec0PrLcY7BmEMfTIJJOq8OrrKdeCauRWQ47tuajVtXr+FXB0U+4FRLs2onBzUI8k2ToY8qNR7TfD5MmirBrYb26S/r0Lm8d86RkkMl4snbwEU0b42e6NbzcjVShAkbGGols7FpziqQWZY4Coo4Z2b2IBLqBZXg4N9laAsR3NlH8JclkUZ34gh5Bnzmr6b/IxTR06aIP0s0W9KEmzuHGv7S/loC1xAgxJMZf/ViLGAGf83jpnp7mMJ5Pbtbbys8tv+Jp4Jobmn/90FkMstkxpoPZX48ImwDfbQ=="], ["swapfree", "0.00 kB"], ["swapsize", "0.00 kB"], ["timezone", "CEST"], ["uniqueid", "ea0afe97"], ["uptime", "4:51 hours"], ["uptime_days", 0], ["uptime_hours", 4], ["uptime_seconds", 17517], ["virtual", "xenu"]]
+  end
+
+  describe :local_ip do
+    it 'on ec2' do
+      @config.stubs(:is_ec2?).returns(true)
+      ## require factor or not?
+      #Facter.stubs(:value).with('ec2_public_ipv4').returns('x.x')
+      #@config.local_ip.must_equal 'xx'
+    end
+
+    it "from ip addr, if local_ip_interface" do
+      @config.stubs(:is_ec2?).returns(false)
+      @config.data['local_ip_interface'] = 'something'
+      @config.stubs(:parse_local_ip_from_interface).returns('x.x.x.x')
+      @config.local_ip.must_equal 'x.x.x.x'
+    end
+
+    describe 'otherwise' do
+      it "from local_ip, if present" do
+        @config.stubs(:is_ec2?).returns(false)
+        @config.data['local_ip_interface'] = nil
+        @config.data['local_ip'] = 'x.x.x.y'
+        @config.local_ip.must_equal 'x.x.x.y'
+      end
+
+      it "from ifconfig with 192.168.x.x regex" do
+
+      end
+      it "from ifconfig with 10.10.x.x regex" do
+
+      end
+    end
+  end
+
+  describe :hostname do
+    it  'read from socket' do
+      Socket.stubs(:gethostname).returns('some_host')
+      @config.hostname.must_equal 'some_host'
+    end
+  end
+
+  describe :is_ec2? do
+    it 'works' do
+      @config.stubs(:read_shell).returns(shell_fixture('arp_eth0.txt'))
+      @config.is_ec2?.must_be :>, 0
+    end
+  end
+
+  describe :parse_local_ip_from_interface do
+    it 'works' do
+      cmd = "ip addr list #{@config.data['local_ip_interface']}"
+      @config.stubs(:read_shell).with(cmd).returns(shell_fixture('ip_addr_list_eth0.txt'))
+      @config.parse_local_ip_from_interface.must_equal "10.10.10.10"
+    end
+  end
+
+  describe :puppet_controller_url do
+    it 'works' do
+      @config.puppet_controller_url.must_equal "http://user:pass@puppet.example.com"
+    end
+  end
+
+  describe "puppet_controller_auth" do
+    it "parses the auth info from url" do
+      @config.stubs(:puppet_controller_url).returns('http://user:pass@puppet.example.com')
+      "http://user:pass@puppet.example.com".must_equal(@config.puppet_controller_url)
+      ['user', 'pass'].must_equal(@config.puppet_controller_auth)
+    end
+  end
+
+  describe :lock_file do
+    it "defaults to /tmp/runpuppet.lock" do
+      @config.lock_file.must_equal "/tmp/runpuppet.lock"
+    end
+  end
+end

data/test/fixtures/runpuppet.yml

@@ -0,0 +1,7 @@
+---
+puppet_controller_url: http://user:pass@puppet.example.com
+command: 'cd /etc/puppet/repo && git fetch && git checkout -f origin/@@branch@@ && puppet apply /etc/puppet/repo/manifests/site.pp'
+verbose_command: 'cd /etc/puppet/repo && git fetch && git checkout -f origin/@@branch@@ && /etc/puppet/repo/bin/prepare_environment.rb && puppet apply -v /etc/puppet/repo/manifests/site.pp'
+branch: master
+local_ip: 10.10.10.10
+local_ip_interface: eth0

data/test/fixtures/shell/arp_eth0.txt

@@ -0,0 +1,2 @@
+asdlkjalksdjlkj
+fe:ff:ff:ff:ff

data/test/fixtures/shell/ip_addr_list_eth0.txt

@@ -0,0 +1,5 @@
+2: eth0: <BROADCAST,MULTICAST,UP,LOWER_UP> mtu 1500 qdisc pfifo_fast state UP qlen 1000
+    link/ether 08:00:27:9f:ac:82 brd ff:ff:ff:ff:ff:ff
+    inet 10.10.10.10/24 scope host lo
+    inet6 fe80::a00:27ff:fe9f:ac82/64 scope link
+       valid_lft forever preferred_lft forever

data/test/helper.rb

@@ -13,3 +13,35 @@ require 'mocha'
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'runpuppet'
+
+def self.fixture_path(path)
+  "test/fixtures/#{path}"
+end
+
+
+def create_test_context(options={})
+  ctx = Dim::Container.new
+
+  ctx.register(:config) do
+    Runpuppet::Config.new(fixture_path('runpuppet.yml'))
+  end
+
+  ctx.register(:client) do |context|
+    Runpuppet::Client.new(context)
+  end
+
+  ctx.register(:agent) do |context|
+    Runpuppet::Agent.new(context)
+  end
+
+  ctx.register(:run_options) do
+    {}
+  end
+
+  ctx.register(:logger) do
+    Runpuppet::Logger
+  end
+  return ctx
+end
+
+TestContext = create_test_context({})

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: runpuppet
 version: !ruby/object:Gem::Version 
-  hash: -3127271948
+  hash: 3495532457
   prerelease: 6
   segments: 
   - 1
   - 0
   - 0
   - rc
-  - 1
-  version: 1.0.0.rc1
+  - 2
+  version: 1.0.0.rc2
 platform: ruby
 authors: 
 - Roman Heinrich
@@ -141,8 +141,23 @@ files:
 - Rakefile
 - VERSION
 - bin/runpuppet
+- lib/ext/core.rb
 - lib/runpuppet.rb
+- lib/runpuppet/agent.rb
+- lib/runpuppet/client.rb
+- lib/runpuppet/config.rb
+- lib/runpuppet/logger.rb
 - runpuppet.gemspec
+- sh/c
+- sh/console.rb
+- sh/test
+- test/agent_test.rb
+- test/binary_test.rb
+- test/client_test.rb
+- test/config_test.rb
+- test/fixtures/runpuppet.yml
+- test/fixtures/shell/arp_eth0.txt
+- test/fixtures/shell/ip_addr_list_eth0.txt
 - test/helper.rb
 homepage: http://github.com/dawanda/runpuppet
 licenses: