vagabond 0.1.4 → 0.2.0

data/lib/vagabond/knife.rb

@@ -1,34 +1,39 @@
-require 'vagabond/helpers'
+require 'thor'
+require File.join(File.dirname(__FILE__), 'cookbooks/lxc/libraries/lxc.rb')
+
+%w(helpers vagabondfile internal_configuration).each do |dep|
+  require "vagabond/#{dep}"
+end
 
 module Vagabond
-  class Knife
+  class Knife < Thor
 
+    include Thor::Actions
     include Helpers
 
-    attr_reader :name_args
+    def initialize(*args)
+      super
+    end
     
-    def initialize(name, name_args)
-      @name_args = name_args
-      @vagabondfile = Vagabondfile.new(Config[:vagabond_file])
-      Config[:disable_solo] = true
-      Config[:sudo] = sudo
+    desc 'knife COMMAND', 'Run knife commands against local Chef server'
+    def knife(command, *args)
+      @options = options.dup
+      @vagabondfile = Vagabondfile.new(options[:vagabond_file])
+      options[:disable_solo] = true
+      options[:sudo] = sudo
       Lxc.use_sudo = @vagabondfile[:sudo].nil? ? true : @vagabondfile[:sudo]
-      @internal_config = InternalConfiguration.new(@vagabondfile, nil)
-      unless(Config[:disable_local_server])
+      @internal_config = InternalConfiguration.new(@vagabondfile, nil, options)
+      unless(options[:local_server])
         if(@vagabondfile[:local_chef_server] && @vagabondfile[:local_chef_server][:enabled])
           srv = Lxc.new(@internal_config[:mappings][:server])
           if(srv.running?)
-            Config[:knife_opts] = " -s https://#{srv.container_ip(10, true)}"
+            options[:knife_opts] = " -s https://#{srv.container_ip(10, true)}"
           else
-            Config[:knife_opts] = ' -s https://no-local-server'
+            options[:knife_opts] = ' -s https://no-local-server'
           end
         end
       end
-
-    end
-
-    def execute
-      exec("knife #{name_args.join(' ')} #{Config[:knife_opts]}")
+      exec("knife #{[command, args].flatten.compact.join(' ')} #{options[:knife_opts]}")
     end
 
     

data/lib/vagabond/server.rb

@@ -5,16 +5,23 @@ require 'digest/md5'
 module Vagabond
   
   class Server < Vagabond
-        
-    def initialize(me, actions)
-      @name = me
-      @base_template = 'ubuntu_1204' # TODO: Make this dynamic
-      @action = actions.shift
-      setup_ui
-      load_configurations
-      Config[:disable_auto_provision] = true
+
+    class << self
+      def basename
+        'vagabond server'
+      end
     end
+
+    self.class_exec(false, &Vagabond::COMMANDS)
     
+    def initialize(*args)
+      super
+      @name = 'server'
+      @base_template = 'ubuntu_1204' # TODO: Make this dynamic
+      setup(nil, name)
+    end
+
+    desc 'server stop', 'Stops the local Chef server'
     def stop
       if(lxc.exists?)
         if(lxc.running?)
@@ -29,6 +36,7 @@ module Vagabond
       end
     end
 
+    desc 'auto_upload', 'Uploads all assets'
     def auto_upload
       ui.info 'Auto uploading all assets to local Chef server...'
       upload_roles
@@ -38,26 +46,28 @@ module Vagabond
       ui.info ui.color('  -> All assets uploaded!', :green)
     end
 
+    desc 'upload_roles', 'Upload all roles'
     def upload_roles
       am_uploading('roles') do
-        com = "knife role from file #{File.join(base_dir, 'roles/*')} #{Config[:knife_opts]}"
+        com = "knife role from file #{File.join(base_dir, 'roles/*')} #{options[:knife_opts]}"
         debug(com)
-        cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+        cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
         cmd.run_command
         cmd.error!
       end
     end
 
+    desc 'upload_databags', 'Upload all data bags'
     def upload_databags
       am_uploading('data bags') do
         Dir.glob(File.join(base_dir, "data_bags/*")).each do |b|
           next if %w(. ..).include?(b)
           coms = [
-            "knife data bag create #{File.basename(b)} #{Config[:knife_opts]}",
-            "knife data bag from file #{File.basename(b)} #{Config[:knife_opts]} --all"
+            "knife data bag create #{File.basename(b)} #{options[:knife_opts]}",
+            "knife data bag from file #{File.basename(b)} #{options[:knife_opts]} --all"
           ].each do |com|
             debug(com)
-            cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+            cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
             cmd.run_command
             cmd.error!
           end
@@ -65,16 +75,18 @@ module Vagabond
       end
     end
 
+    desc 'upload_environments', 'Upload all environments'
     def upload_environments
       am_uploading('environments') do
-        com = "knife environment from file #{File.join(base_dir, 'environments/*')} #{Config[:knife_opts]}"
+        com = "knife environment from file #{File.join(base_dir, 'environments/*')} #{options[:knife_opts]}"
         debug(com)
-        cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+        cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
         cmd.run_command
         cmd.error!
       end
     end
 
+    desc 'upload_cookbooks', 'Upload all cookbooks'
     def upload_cookbooks
       am_uploading('cookbooks') do
         if(vagabondfile[:local_chef_server][:berkshelf])
@@ -87,6 +99,13 @@ module Vagabond
 
     private
 
+    def validate!
+    end
+
+    def setup(action, name=nil, *args)
+      super(action, 'server', *args)
+    end
+    
     def am_uploading(thing)
       ui.info "#{ui.color('Local chef server:', :bold)} Uploading #{ui.color(thing, :green)}"
       yield
@@ -110,19 +129,10 @@ module Vagabond
       end
     end
     
-    def generated_name
-      unless(@_gn)
-        s = Digest::MD5.new
-        s << vagabondfile.path
-        @_gn = "server-#{s.hexdigest}"
-      end
-      @_gn
-    end
-
     def do_create
-      com = "#{Config[:sudo]}lxc-clone -n #{generated_name} -o #{@base_template}"
+      com = "#{options[:sudo]}lxc-clone -n #{generated_name} -o #{@base_template}"
       debug(com)
-      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+      cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
       cmd.run_command
       cmd.error!
       @lxc = Lxc.new(generated_name)
@@ -132,13 +142,13 @@ module Vagabond
       lxc.start
       ui.info ui.color('  -> Bootstrapping erchef...', :cyan)
       tem_file = File.expand_path(File.join(File.dirname(__FILE__), 'bootstraps/server.erb'))
-      com = "#{Config[:sudo]}knife bootstrap #{lxc.container_ip(10, true)} --template-file #{tem_file} -i /opt/hw-lxc-config/id_rsa"
+      com = "#{options[:sudo]}knife bootstrap #{lxc.container_ip(10, true)} --template-file #{tem_file} -i /opt/hw-lxc-config/id_rsa"
       debug(com)
-      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug], :timeout => 1200)
+      cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug], :timeout => 1200)
       cmd.run_command
       cmd.error!
       ui.info ui.color('  -> Chef Server CREATED!', :green)
-      Config[:knife_opts] = " --server-url https://#{lxc.container_ip(20, true)}"
+      options[:knife_opts] = " --server-url https://#{lxc.container_ip(20, true)}"
       auto_upload if vagabondfile[:local_chef_server][:auto_upload]
     end
 
@@ -146,16 +156,16 @@ module Vagabond
       write_berks_config
       com = "berks upload -c #{File.join(vagabond_dir, 'berks.json')}"
       debug(com)
-      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+      cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
       cmd.run_command
       cmd.error!
       ui.info "Berks cookbook upload complete!"
     end
 
     def raw_upload
-      com = "knife cookbook upload#{Config[:knife_opts]} --all"
+      com = "knife cookbook upload#{options[:knife_opts]} --all"
       debug(com)
-      cmd = Mixlib::ShellOut.new(com, :live_stream => Config[:debug])
+      cmd = Mixlib::ShellOut.new(com, :live_stream => options[:debug])
       cmd.run_command
       cmd.error!
       ui.info "Cookbook upload complete!"

data/lib/vagabond/vagabond.rb

@@ -1,101 +1,189 @@
+require 'thor'
+require 'chef/knife/core/ui'
+require File.join(File.dirname(__FILE__), 'cookbooks/lxc/libraries/lxc.rb')
+
+%w(vagabondfile internal_configuration helpers).each do |dep|
+  require "vagabond/#{dep}"
+end
+
 Dir.glob(
   File.join(
     File.dirname(__FILE__), 'actions', '*.rb'
   )
-).each do |action_module|
-  require action_module
+).each do |action|
+  require "vagabond/actions/#{File.basename(action).sub('.rb', '')}"
 end
 
-require 'vagabond/vagabondfile'
-require 'vagabond/internal_configuration'
-require 'vagabond/helpers'
-require 'chef/knife/core/ui'
-require File.join(File.dirname(__FILE__), 'cookbooks/lxc/libraries/lxc.rb')
-
 module Vagabond
-  class Vagabond
-
+  class Vagabond < Thor
+    
+    include Thor::Actions
     include Helpers
 
-    class << self
-      attr_accessor :ui
+    Actions.constants.each do |const|
+      klass = Actions.const_get(const)
+      include klass if klass.is_a?(Module)
     end
     
-    # Load available actions
-    Actions.constants.each do |const_sym|
-      const = Actions.const_get(const_sym)
-      include const if const.is_a?(Module)
-    end
-
     attr_reader :name
-    attr_reader :lxc
     attr_reader :vagabondfile
-    attr_reader :config
     attr_reader :internal_config
     attr_reader :ui
+    attr_reader :options
+
+    attr_accessor :mappings_key
+    attr_accessor :lxc
+    attr_accessor :config
+    attr_accessor :action
+
+    CLI_OPTIONS = lambda do
+    class_option(:debug,
+      :type => :boolean,
+      :default => false
+    )
+
+    class_option(:force_solo,
+      :aliases => '--force-configure',
+      :type => :boolean,
+      :default => false,
+      :desc => 'Force configuration of system'
+    )
 
+    class_option(:color,
+      :type => :boolean,
+      :default => true,
+      :desc => 'Enable/disable colorized output'
+    )
+
+    class_option(:vagabond_file,
+      :aliases => '-f',
+      :type => :string,
+      :desc => 'Provide path to Vagabondfile'
+    )
+    
+    class_option(:local_server,
+      :type => :boolean,
+      :default => true,
+      :desc => 'Enable/disable local Chef server usage if available'
+    )
+    end
+
+    CLI_OPTIONS.call
+
+    
     # action:: Action to perform
     # name:: Name of vagabond
     # config:: Hash configuration
     #
-    # Creates an instance
-    def initialize(action, name_args)
+    # Creates an instance    
+    def initialize(*args)
+      super
+      @mappings_key = :mappings
+    end
+
+    ## COMMANDS
+
+    COMMANDS = lambda do |show_node=true|
+      Actions.constants.find_all do |const|
+        Actions.const_get(const).is_a?(Module)
+      end.map(&:to_s).map(&:downcase).each do |meth|
+        if(self.respond_to?("_#{meth}_desc"))
+          args = self.send("_#{meth}_desc")
+        else
+          args = ["#{meth}#{' NODE' if show_node}", "#{meth.capitalize} instance#{' of NODE' if show_node}"]
+        end
+        desc(*args)
+        if(self.respond_to?("_#{meth}_options"))
+          self.send("_#{meth}_options").each do |opts|
+            method_option(*opts)
+          end
+        end
+        define_method meth do |*args|
+          setup(meth, *args)
+          execute
+        end
+      end
+    end
+
+    COMMANDS.call
+
+    protected
+
+    def version
       setup_ui
+      ui.info "#{ui.color('Vagabond:', :yellow, :bold)} - Advocating idleness and work-shyness"
+      ui.info "  #{ui.color('Version:', :blue)} - #{VERSION.version} (#{VERSION.codename})"
+      exit EXIT_CODES[:success]
+    end
+    
+    def execute
+      self.send("_#{@action}")
+    end
+    
+    def setup(action, name=nil, *args)
       @action = action
-      @name = name_args.shift
+      @name = name
+      @options = options.dup
+      if(args.last.is_a?(Hash))
+        _ui = args.delete(:ui)
+        @options.merge!(args.last)
+      end
+      setup_ui(_ui)
       load_configurations
       validate!
     end
 
+    def name_required!
+      unless(name)
+        ui.fatal "Node name is required!"
+        exit EXIT_CODES[:missing_node_name]
+      end
+    end
+
+    def provision_solo(path)
+      ui.info "#{ui.color('Vagabond:', :bold)} Provisioning node: #{ui.color(name, :magenta)}"
+      lxc.container_ip(20) # force wait for container to appear and do so quietly
+      direct_container_command(
+        "chef-solo -c #{File.join(path, 'solo.rb')} -j #{File.join(path, 'dna.json')}",
+        :live_stream => STDOUT
+      )
+    end
+    
     def load_configurations
-      @vagabondfile = Vagabondfile.new(Config[:vagabond_file])
-      Config[:sudo] = sudo
-      Config[:disable_solo] = true if @action.to_sym == :status
+      @vagabondfile = Vagabondfile.new(options[:vagabond_file])
+      options[:sudo] = sudo
+      options[:disable_solo] = true if @action.to_s == 'status' && lxc_installed?
       Lxc.use_sudo = @vagabondfile[:sudo].nil? ? true : @vagabondfile[:sudo]
-      @internal_config = InternalConfiguration.new(@vagabondfile, ui)
+      @internal_config = InternalConfiguration.new(@vagabondfile, ui, options)
       @config = @vagabondfile[:boxes][name]
-      @lxc = Lxc.new(@internal_config[:mappings][name] || '____nonreal____')
-      unless(Config[:disable_local_server])
+      @lxc = Lxc.new(@internal_config[mappings_key][name] || '____nonreal____')
+      if(options[:local_server] && lxc_installed?)
         if(@vagabondfile[:local_chef_server] && @vagabondfile[:local_chef_server][:enabled])
-          srv = Lxc.new(@internal_config[:mappings][:server])
-          if(srv.running?)
-            Config[:knife_opts] = " --server-url https://#{srv.container_ip(10, true)}"
+          srv_name = @internal_config[:mappings][:server]
+          srv = Lxc.new(srv_name) if srv_name
+          if(srv_name && srv.running?)
+            options[:knife_opts] = " --server-url https://#{srv.container_ip(10, true)}"
           else
             ui.warn 'Local chef server is not currently running!' unless @action.to_sym == :status
-            Config[:knife_opts] = ' --server-url https://no-local-server'
+            options[:knife_opts] = ' --server-url https://no-local-server'
           end
         end
       end
     end
 
-    protected
-
-    def setup_ui
-      Chef::Config[:color] = Config[:color].nil? ? true : Config[:color]
-      @ui = Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
-      self.class.ui = @ui
-    end
-
     def validate!
       if(name.to_s == 'server')
-        ui.fatal "Invalid name supplied: #{ui.color(name, :red)}"
+        ui.fatal "RESERVED node name supplied: #{ui.color(name, :red)}"
         ui.info ui.color("  -> Try: vagabond server #{@action}", :cyan)
-        exit -1
+        exit EXIT_CODES[:reserved_name]
       end
-    end
-    
-    def execute
-      if(public_methods.include?(@action.to_sym))
-        send(@action)
-      else
-        ui.error "Invalid action received: #{@action}"
+      if(name && config.nil? && !options[:disable_name_validate])
+        ui.fatal "Invalid node name supplied: #{ui.color(name, :red)}"
+        ui.info ui.color("  -> Available: #{vagabondfile[:nodes].keys.sort.join(', ')}", :cyan)
+        exit EXIT_CODES[:invalid_name]
       end
     end
-
-    def generate_hash
-      Digest::MD5.hexdigest(@vagabondfile.path)
-    end
-
+    
     def check_existing!
       if(@lxc.exists?)
         ui.error "LXC: #{name} already exists!"
@@ -110,5 +198,9 @@ module Vagabond
     def vagabond_dir
       File.join(base_dir, '.vagabond')
     end
+
+    def lxc_installed?
+      system('which lxc-info > /dev/null')
+    end
   end
 end

data/lib/vagabond/vagabondfile.rb

@@ -6,19 +6,44 @@ module Vagabond
     attr_reader :path
     attr_reader :config
 
-    def initialize(path=nil)
+    ALIASES = Mash.new(:boxes => :nodes, :nodes => :boxes)
+    
+    def initialize(path=nil, *args)
       path = discover_path(Dir.pwd) unless path
       @path = path
-      load_configuration!
+      load_configuration!(args.include?(:allow_missing))
     end
 
     def [](k)
-      @config[k]
+      aliased(k) || @config[k]
     end
 
-    def load_configuration!
-      raise 'No Vagabondfile file found!' unless @path && File.exists?(@path)
-      @config = Mash.new(self.instance_eval(IO.read(@path), @path, 1))
+    def aliased(k)
+      if(ALIASES.has_key?(k))
+        v = [@config[k], @config[ALIASES[k]]].compact
+        if(v.size > 1)
+          case v.first.class
+          when Array
+            m = :|
+          when Hash
+            m = :merge
+          else
+            m = :+
+          end
+          v.inject(&m)
+        else
+          v.first
+        end
+      end
+    end
+    
+    def load_configuration!(no_raise = false)
+      if(@path && File.exists?(@path))
+        @config = Mash.new(self.instance_eval(IO.read(@path), @path, 1))
+      else
+        raise 'No Vagabondfile file found!' unless no_raise
+        @config = Mash.new
+      end
     end
 
     def discover_path(path)

data/lib/vagabond/version.rb

@@ -6,5 +6,5 @@ module Vagabond
       super(v)
     end
   end
-  VERSION = Version.new('0.1.4', 'vagari')
+  VERSION = Version.new('0.2.0', 'frank the tank')
 end

data/vagabond.gemspec

@@ -15,4 +15,7 @@ Gem::Specification.new do |s|
   s.files = Dir['**/*']
   s.executables = ['vagabond']
   s.add_dependency 'chef'
+  s.add_dependency 'librarian'
+  s.add_dependency 'test-kitchen', '1.0.0.alpha.0'
+  s.add_dependency 'thor'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagabond
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-14 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -27,6 +27,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: librarian
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-kitchen
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.0.alpha.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Vagabonds, lazing about
 email: chrisroberts.code@gmail.com
 executables:
@@ -76,15 +124,16 @@ files:
 - lib/vagabond/cookbooks/vagabond/attributes/default.rb
 - lib/vagabond/cookbooks/vagabond/libraries/vagabond.rb
 - lib/vagabond/cookbooks/vagabond/recipes/default.rb
-- lib/vagabond/commands.rb
 - lib/vagabond/server.rb
+- lib/vagabond/kitchen.rb
 - lib/vagabond/vagabondfile.rb
 - lib/vagabond/bootstraps/server.erb
 - lib/vagabond/version.rb
 - lib/vagabond/knife.rb
 - lib/vagabond/vagabond.rb
+- lib/vagabond/constants.rb
 - lib/vagabond/helpers.rb
-- lib/vagabond/config.rb
+- lib/vagabond/helpers/cheffile_loader.rb
 - lib/vagabond/internal_configuration.rb
 - lib/vagabond/actions/up.rb
 - lib/vagabond/actions/create.rb
@@ -100,6 +149,7 @@ files:
 - README.md
 - vagabond.gemspec
 - bin/vagabond
+- USAGE.md
 - CHANGELOG.md
 homepage: http://github.com/chrisroberts/vagabond
 licenses: []