jamie 0.1.0.alpha14 → 0.1.0.alpha15

data/Rakefile

@@ -7,7 +7,6 @@ Cane::RakeTask.new do |cane|
   cane.abc_exclude = %w(
     Jamie::RakeTasks#define
     Jamie::ThorTasks#define
-    Jamie::Vagrant.define_vagrant_vm
     Jamie::CLI#pry_prompts
   )
   cane.style_exclude = %w(

data/bin/jamie

@@ -1,6 +1,10 @@
 #!/usr/bin/env ruby
 # -*- encoding: utf-8 -*-
 
+# Trap interrupts to quit cleanly. See
+# https://twitter.com/mitchellh/status/283014103189053442
+Signal.trap("INT") { exit 1 }
+
 $:.unshift File.join(File.dirname(__FILE__), %w{.. lib})
 require 'jamie/cli'
 

data/jamie.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'net-ssh'
   gem.add_dependency 'net-scp'
   gem.add_dependency 'mixlib-shellout'
-  gem.add_dependency 'vagrant', '~> 1.0.5'
 
   gem.add_development_dependency 'yard'
   gem.add_development_dependency 'maruku'

data/lib/jamie.rb

@@ -9,6 +9,7 @@ require 'mixlib/shellout'
 require 'net/https'
 require 'net/scp'
 require 'net/ssh'
+require 'pathname'
 require 'socket'
 require 'stringio'
 require 'yaml'
@@ -834,7 +835,7 @@ module Jamie
       end
 
       def prepare_chef_home(ssh_args)
-        ssh(ssh_args, "sudo rm -rf #{chef_home} && mkdir -p #{chef_home}")
+        ssh(ssh_args, "sudo rm -rf #{chef_home} && mkdir -p #{chef_home}/cache")
       end
 
       def upload_chef_data(ssh_args, instance)

data/lib/jamie/cli.rb

@@ -190,7 +190,7 @@ module Jamie
       run_list = cookbook_name ? "recipe[#{cookbook_name}]" : nil
       attributes = cookbook_name ? { cookbook_name => nil } : nil
 
-      { 'default_driver' => 'vagrant',
+      { 'driver_plugin' => 'vagrant',
         'platforms' => platforms,
         'suites' => [
           { 'name' => 'standard',

data/lib/jamie/version.rb

@@ -2,5 +2,5 @@
 
 module Jamie
 
-  VERSION = "0.1.0.alpha14"
+  VERSION = "0.1.0.alpha15"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha14
+  version: 0.1.0.alpha15
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-22 00:00:00.000000000 Z
+date: 2012-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -75,22 +75,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: vagrant
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -174,10 +158,8 @@ files:
 - jamie.gemspec
 - lib/jamie.rb
 - lib/jamie/cli.rb
-- lib/jamie/driver/vagrant.rb
 - lib/jamie/rake_tasks.rb
 - lib/jamie/thor_tasks.rb
-- lib/jamie/vagrant.rb
 - lib/jamie/version.rb
 - lib/vendor/hash_recursive_merge.rb
 - templates/plugin/driver.rb.erb
@@ -201,7 +183,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 168460114090032110
+      hash: 2338100729257258503
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/jamie/driver/vagrant.rb

@@ -1,39 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-require 'jamie'
-
-module Jamie
-
-  module Driver
-
-    # Vagrant driver for Jamie. It communicates to Vagrant via the CLI.
-    class Vagrant < Jamie::Driver::SSHBase
-
-      default_config 'memory', '256'
-
-      def perform_create(instance, state)
-        state['name'] = instance.name
-        run_command "vagrant up #{state['name']} --no-provision"
-      end
-
-      def perform_converge(instance, state)
-        run_command "vagrant provision #{state['name']}"
-      end
-
-      def perform_destroy(instance, state)
-        run_command "vagrant destroy #{state['name']} -f"
-        state.delete('name')
-      end
-
-      protected
-
-      def generate_ssh_args(state)
-        Array(state['name'])
-      end
-
-      def ssh(ssh_args, cmd)
-        run_command %{vagrant ssh #{ssh_args.first} --command '#{cmd}'}
-      end
-    end
-  end
-end

data/lib/jamie/vagrant.rb

@@ -1,57 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-require 'forwardable'
-require 'vagrant'
-
-require 'jamie'
-
-module Jamie
-
-  module Vagrant
-
-    # A Vagrant confiuration class which wraps a Jamie::Config instance.
-    class Config < ::Vagrant::Config::Base
-      extend Forwardable
-
-      def_delegators :@config, :suites, :suites=, :platforms, :platforms=,
-        :instances, :yaml_file, :yaml_file=, :log_level, :log_level=,
-        :test_base_path, :test_base_path=, :yaml_data
-
-      def initialize
-        @config = Jamie::Config.new
-      end
-    end
-
-    # Defines all Vagrant virtual machines, one for each instance.
-    #
-    # @param config [Vagrant::Config::Top] Vagrant top level config object
-    def self.define_vms(config)
-      config.jamie.instances.each do |instance|
-        define_vagrant_vm(config, instance)
-      end
-    end
-
-    private
-
-    def self.define_vagrant_vm(config, instance)
-      driver = instance.platform.driver
-
-      config.vm.define instance.name do |c|
-        c.vm.box = driver['box']
-        c.vm.box_url = driver['box_url'] if driver['box_url']
-        c.vm.host_name = "#{instance.name}.vagrantup.com"
-        c.vm.customize ["modifyvm", :id, "--memory", driver['memory']]
-
-        c.vm.provision :chef_solo do |chef|
-          chef.log_level = config.jamie.log_level
-          chef.run_list = instance.run_list
-          chef.json = instance.attributes
-          chef.data_bags_path = instance.suite.data_bags_path
-          chef.roles_path = instance.suite.roles_path
-        end
-      end
-    end
-  end
-end
-
-Vagrant.config_keys.register(:jamie) { Jamie::Vagrant::Config }