vagabond 0.2.0 → 0.2.2

data/lib/vagabond/uploader/librarian.rb

@@ -0,0 +1,31 @@
+require 'vagabond/uploader/knife'
+
+module Vagabond
+  class Uploader
+    class Librarian < Knife
+
+      def initialize(*args)
+        super
+        unless(options[:cheffile])
+          raise ArgumentError.new "Option 'cheffile' is required!"
+        end
+        unless(File.exists?(options[:cheffile]))
+          raise ArgumentError.new "Option 'cheffile' is not a valid path!"
+        end
+      end
+
+      def prepare
+        com = "librarian-chef install --path=#{store}"
+        debug(com)
+        cmd = Mixlib::ShellOut.new(com,
+          :live_stream => options[:debug],
+          :cwd => File.dirname(options[:cheffile])
+        )
+        cmd.run_command
+        cmd.error!
+        options[:cookbook_paths] = [store]
+      end
+      
+    end
+  end
+end

data/lib/vagabond/vagabond.rb

@@ -1,8 +1,9 @@
 require 'thor'
 require 'chef/knife/core/ui'
+require 'vagabond/uploader'
 require File.join(File.dirname(__FILE__), 'cookbooks/lxc/libraries/lxc.rb')
 
-%w(vagabondfile internal_configuration helpers).each do |dep|
+%w(constants errors vagabondfile internal_configuration helpers).each do |dep|
   require "vagabond/#{dep}"
 end
 
@@ -78,6 +79,7 @@ module Vagabond
     # Creates an instance    
     def initialize(*args)
       super
+      @threads = Mash.new
       @mappings_key = :mappings
     end
 
@@ -113,7 +115,7 @@ module Vagabond
       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]
+      exit
     end
     
     def execute
@@ -125,18 +127,20 @@ module Vagabond
       @name = name
       @options = options.dup
       if(args.last.is_a?(Hash))
-        _ui = args.delete(:ui)
+        _ui = args.last.delete(:ui)
         @options.merge!(args.last)
       end
+      @leftover_args = args
       setup_ui(_ui)
       load_configurations
-      validate!
+      validate! unless action == 'cluster' # TODO -> allow action
+      # method to check for validation run
     end
 
     def name_required!
       unless(name)
         ui.fatal "Node name is required!"
-        exit EXIT_CODES[:missing_node_name]
+        raise VagabondError::MissingNodeName.new
       end
     end
 
@@ -150,9 +154,10 @@ module Vagabond
     end
     
     def load_configurations
-      @vagabondfile = Vagabondfile.new(options[:vagabond_file])
+      @vagabondfile = Vagabondfile.new(options[:vagabond_file], :allow_missing)
       options[:sudo] = sudo
       options[:disable_solo] = true if @action.to_s == 'status' && lxc_installed?
+      Chef::Log.init('/dev/null') unless options[:debug]
       Lxc.use_sudo = @vagabondfile[:sudo].nil? ? true : @vagabondfile[:sudo]
       @internal_config = InternalConfiguration.new(@vagabondfile, ui, options)
       @config = @vagabondfile[:boxes][name]
@@ -162,10 +167,12 @@ module Vagabond
           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)}"
+            proto = @vagabondfile[:local_chef_server][:zero] ? 'http' : 'https'
+            options[:knife_opts] = " --server-url #{proto}://#{srv.container_ip(10, true)}"
           else
-            ui.warn 'Local chef server is not currently running!' unless @action.to_sym == :status
-            options[:knife_opts] = ' --server-url https://no-local-server'
+            unless(@action.to_sym == :status || name.to_s =='server')
+              ui.warn 'Local chef server is not currently running!' unless @action.to_sym == :status
+            end
           end
         end
       end
@@ -175,12 +182,12 @@ module Vagabond
       if(name.to_s == 'server')
         ui.fatal "RESERVED node name supplied: #{ui.color(name, :red)}"
         ui.info ui.color("  -> Try: vagabond server #{@action}", :cyan)
-        exit EXIT_CODES[:reserved_name]
+        raise VagabondError::ReservedName.new(name)
       end
       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]
+        raise VagabondError::InvalidName.new(name)
       end
     end
     
@@ -202,5 +209,17 @@ module Vagabond
     def lxc_installed?
       system('which lxc-info > /dev/null')
     end
+
+    def wait_for_completion(type=nil)
+      if(type)
+        Array(@threads[:type]).map(&:join)
+      else
+        @threads.values.map do |threads|
+          threads.each do |thread_set|
+            Array(thread_set).map(&:join)
+          end
+        end
+      end
+    end
   end
 end

data/lib/vagabond/vagabondfile.rb

@@ -6,6 +6,7 @@ module Vagabond
     attr_reader :path
     attr_reader :config
 
+    DEFAULT_KEYS = %w(boxes mappings test_mappings spec_mappings local_chef_server)
     ALIASES = Mash.new(:boxes => :nodes, :nodes => :boxes)
     
     def initialize(path=nil, *args)
@@ -15,6 +16,9 @@ module Vagabond
     end
 
     def [](k)
+      if(DEFAULT_KEYS.include?(k.to_s))
+        @config[k] ||= Mash.new
+      end
       aliased(k) || @config[k]
     end
 
@@ -22,10 +26,10 @@ module Vagabond
       if(ALIASES.has_key?(k))
         v = [@config[k], @config[ALIASES[k]]].compact
         if(v.size > 1)
-          case v.first.class
+          case v.first
           when Array
             m = :|
-          when Hash
+          when Hash, Mash
             m = :merge
           else
             m = :+
@@ -37,15 +41,42 @@ module Vagabond
       end
     end
     
-    def load_configuration!(no_raise = false)
+    def load_configuration!(*args)
+      unless(args.empty?)
+        no_raise = args.first == true
+        force_store = args.include?(:force_store_path)
+        no_raise ||= force_store
+      end
       if(@path && File.exists?(@path))
         @config = Mash.new(self.instance_eval(IO.read(@path), @path, 1))
-      else
+      end
+      if(!@config || force_store)
         raise 'No Vagabondfile file found!' unless no_raise
-        @config = Mash.new
+        generate_store_path
+        @config = Mash[*DEFAULT_KEYS.map{|k| [k, Mash.new]}.flatten]
       end
     end
 
+    def generate_store_path
+      @path ||= File.expand_path(File.join(Dir.pwd, 'Vagabondfile'))
+      @store_path = File.join('/tmp/vagabond-solos', directory.gsub(%r{[^0-9a-zA-Z]}, '-'), 'Vagabondfile')
+      @store_path = File.expand_path(@store_path.gsub('-', '/'))
+      FileUtils.mkdir_p(File.dirname(@store_path))
+      File.dirname(@store_path)
+    end
+
+    def store_path
+      @store_path || @path
+    end
+
+    def directory
+      File.dirname(@path)
+    end
+
+    def store_directory
+      File.dirname(@store_path || @path)
+    end
+    
     def discover_path(path)
       d_path = Dir.glob(File.join(path, 'Vagabondfile')).first
       unless(d_path)
@@ -55,5 +86,9 @@ module Vagabond
       end
       d_path
     end
+
+    def local_chef_server?
+      self[:local_chef_server] && self[:local_chef_server][:enabled]
+    end
   end
 end

data/lib/vagabond/version.rb

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

data/vagabond.gemspec

@@ -15,7 +15,10 @@ 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 'librarian-chef'
+  s.add_dependency 'test-kitchen', '>= 1.0.0.alpha'
   s.add_dependency 'thor'
+  s.add_dependency 'uuidtools'
+  s.add_dependency 'elecksee', '>= 1.0.3'
+  s.add_dependency 'serverspec', '>= 0.6.3'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vagabond
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-23 00:00:00.000000000 Z
+date: 2013-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -28,7 +28,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: librarian
+  name: librarian-chef
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -48,17 +48,17 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.0
+        version: 1.0.0.alpha
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0.alpha.0
+        version: 1.0.0.alpha
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -75,6 +75,54 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: uuidtools
+  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: elecksee
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.3
+- !ruby/object:Gem::Dependency
+  name: serverspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 0.6.3
 description: Vagabonds, lazing about
 email: chrisroberts.code@gmail.com
 executables:
@@ -83,35 +131,34 @@ extensions: []
 extra_rdoc_files:
 - README.md
 files:
+- lib/vagabond/cookbooks/lxc/files/default/lxc-awesome-ephemeral
 - lib/vagabond/cookbooks/lxc/files/default/knife_lxc
 - lib/vagabond/cookbooks/lxc/metadata.rb
 - lib/vagabond/cookbooks/lxc/templates/default/interface.erb
 - lib/vagabond/cookbooks/lxc/templates/default/fstab.erb
 - lib/vagabond/cookbooks/lxc/templates/default/client.rb.erb
+- lib/vagabond/cookbooks/lxc/templates/default/file_content.erb
 - lib/vagabond/cookbooks/lxc/templates/default/default-lxc.erb
-- lib/vagabond/cookbooks/lxc/test/kitchen/cookbooks/lxc_test/metadata.rb
-- lib/vagabond/cookbooks/lxc/test/kitchen/cookbooks/lxc_test/recipes/lxc_files.rb
-- lib/vagabond/cookbooks/lxc/test/kitchen/cookbooks/lxc_test/recipes/centos_lxc.rb
-- lib/vagabond/cookbooks/lxc/test/kitchen/cookbooks/lxc_test/recipes/lxc_templates.rb
-- lib/vagabond/cookbooks/lxc/test/kitchen/cookbooks/lxc_test/recipes/ubuntu_lxc.rb
-- lib/vagabond/cookbooks/lxc/test/kitchen/cookbooks/lxc_test/recipes/chef-bootstrap.rb
-- lib/vagabond/cookbooks/lxc/test/kitchen/Kitchenfile
 - lib/vagabond/cookbooks/lxc/Gemfile
 - lib/vagabond/cookbooks/lxc/attributes/default.rb
 - lib/vagabond/cookbooks/lxc/README.md
 - lib/vagabond/cookbooks/lxc/providers/fstab.rb
+- lib/vagabond/cookbooks/lxc/providers/default.rb
 - lib/vagabond/cookbooks/lxc/providers/interface.rb
 - lib/vagabond/cookbooks/lxc/providers/service.rb
 - lib/vagabond/cookbooks/lxc/providers/config.rb
+- lib/vagabond/cookbooks/lxc/providers/ephemeral.rb
 - lib/vagabond/cookbooks/lxc/providers/container.rb
+- lib/vagabond/cookbooks/lxc/libraries/monkey.rb
 - lib/vagabond/cookbooks/lxc/libraries/lxc_file_config.rb
 - lib/vagabond/cookbooks/lxc/libraries/lxc_expanded_resources.rb
 - lib/vagabond/cookbooks/lxc/libraries/lxc.rb
 - lib/vagabond/cookbooks/lxc/resources/fstab.rb
+- lib/vagabond/cookbooks/lxc/resources/default.rb
 - lib/vagabond/cookbooks/lxc/resources/interface.rb
 - lib/vagabond/cookbooks/lxc/resources/service.rb
 - lib/vagabond/cookbooks/lxc/resources/config.rb
-- lib/vagabond/cookbooks/lxc/resources/#container.rb#
+- lib/vagabond/cookbooks/lxc/resources/ephemeral.rb
 - lib/vagabond/cookbooks/lxc/resources/container.rb
 - lib/vagabond/cookbooks/lxc/CHANGELOG.md
 - lib/vagabond/cookbooks/lxc/Gemfile.lock
@@ -122,29 +169,42 @@ files:
 - lib/vagabond/cookbooks/vagabond/files/default/lxc-centos
 - lib/vagabond/cookbooks/vagabond/metadata.rb
 - lib/vagabond/cookbooks/vagabond/attributes/default.rb
+- lib/vagabond/cookbooks/vagabond/README.md
 - lib/vagabond/cookbooks/vagabond/libraries/vagabond.rb
 - lib/vagabond/cookbooks/vagabond/recipes/default.rb
+- lib/vagabond/cookbooks/vagabond/recipes/zero.rb
+- lib/vagabond/errors.rb
 - lib/vagabond/server.rb
 - lib/vagabond/kitchen.rb
 - lib/vagabond/vagabondfile.rb
+- lib/vagabond/bootstraps/server-zero.erb
 - lib/vagabond/bootstraps/server.erb
 - lib/vagabond/version.rb
 - lib/vagabond/knife.rb
+- lib/vagabond/layout.rb
 - lib/vagabond/vagabond.rb
+- lib/vagabond/monkey/kitchen_config.rb
+- lib/vagabond/uploader/berkshelf.rb
+- lib/vagabond/uploader/knife.rb
+- lib/vagabond/uploader/librarian.rb
 - lib/vagabond/constants.rb
 - lib/vagabond/helpers.rb
+- lib/vagabond/spec.rb
 - lib/vagabond/helpers/cheffile_loader.rb
 - lib/vagabond/internal_configuration.rb
 - lib/vagabond/actions/up.rb
 - lib/vagabond/actions/create.rb
 - lib/vagabond/actions/provision.rb
 - lib/vagabond/actions/status.rb
+- lib/vagabond/actions/init.rb
 - lib/vagabond/actions/start.rb
+- lib/vagabond/actions/cluster.rb
 - lib/vagabond/actions/thaw.rb
 - lib/vagabond/actions/rebuild.rb
 - lib/vagabond/actions/destroy.rb
 - lib/vagabond/actions/freeze.rb
 - lib/vagabond/actions/ssh.rb
+- lib/vagabond/uploader.rb
 - lib/vagabond.rb
 - README.md
 - vagabond.gemspec

data/lib/vagabond/cookbooks/lxc/resources/#container.rb#

@@ -1,28 +0,0 @@
-actions :create, :delete, :clone
-default_action :create
-
-attribute :base_container, :kind_of => String
-attribute :validation_client, :kind_of => String
-attribute :validator_pem, :kind_of => String, :default => nil
-attribute :server_uri, :kind_of => String
-attribute :chef_environment, :kind_of => String, :default => '_default'
-attribute :node_name, :kind_of => String
-attribute :run_list, :kind_of => Array
-attribute :chef_enabled, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :chef_retries, :kind_of => Fixnum, :default => 0
-attribute :copy_data_bag_secret_file, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :data_bag_secret_file, :kind_of => String, :default => Chef::EncryptedDataBagItem::DEFAULT_SECRET_FILE
-attribute :default_bridge, :kind_of => String
-attribute :static_ip, :kind_of => String
-attribute :static_netmask, :kind_of => String, :default => '255.255.255.0'
-attribute :static_gateway, :kind_of => String
-attribute :default_config, :kind_of => [TrueClass, FalseClass], :default => true
-attribute :default_fstab, :kind_of => [TrueClass, FalseClass], :default => true
-attribute :container_commands, :kind_of => Array, :default => []
-attribute :initialize_commands, :kind_of => Array, :default => []
-attribute :new_container, :kind_of => [TrueClass, FalseClass], :default => false
-attribute :template, :kind_of => String, :default => 'ubuntu'
-attribute :template_opts, :kind_of => Hash, :default => {}
-attribute :_lxc
-# TODO: We should ultimately have support for all these templates
-#attribute :template, :equal_to => %w(busybox debian fedora opensuse sshd ubuntu ubuntu-cloud), :default => 'ubuntu'