jamie-vagrant 0.2.2 → 0.2.3

data/jamie-vagrant.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
 
-  gem.add_dependency 'jamie'
+  gem.add_dependency 'jamie', '~> 0.1.0.alpha19'
   gem.add_dependency 'vagrant', '~> 1.0.5'
 
   gem.add_development_dependency 'cane'

data/lib/jamie/driver/vagrant.rb

@@ -29,31 +29,38 @@ module Jamie
 
       default_config 'memory', '256'
 
-      def create(instance, state)
+      def create(state)
         # @todo Vagrantfile setup will be placed in any dependency hook
         #   checks when feature is released
         vagrantfile = File.join(config['jamie_root'], "Vagrantfile")
         create_vagrantfile(vagrantfile) unless File.exists?(vagrantfile)
 
         state['hostname'] = instance.name
-        run_command "vagrant up #{state['hostname']} --no-provision"
+        run "vagrant up #{state['hostname']} --no-provision"
+        info("Vagrant instance <#{state['hostname']}> created.")
       end
 
-      def converge(instance, state)
-        run_command "vagrant provision #{state['hostname']}"
+      def converge(state)
+        run "vagrant provision #{state['hostname']}"
       end
 
-      def destroy(instance, state)
+      def destroy(state)
         return if state['hostname'].nil?
 
-        run_command "vagrant destroy #{state['hostname']} -f"
+        run "vagrant destroy #{state['hostname']} -f"
+        info("Vagrant instance <#{state['hostname']}> destroyed.")
         state.delete('hostname')
       end
 
       protected
 
       def ssh(ssh_args, cmd)
-        run_command %{vagrant ssh #{ssh_args.first} --command '#{cmd}'}
+        run %{vagrant ssh #{ssh_args.first} --command '#{cmd}'}
+      end
+
+      def run(cmd)
+        cmd = "echo #{cmd}" if config['dry_run']
+        run_command(cmd)
       end
 
       def create_vagrantfile(vagrantfile)

data/lib/jamie/driver/vagrant_version.rb

@@ -21,6 +21,6 @@ module Jamie
   module Driver
 
     # Version string for Vagrant Jamie driver
-    VAGRANT_VERSION = "0.2.2"
+    VAGRANT_VERSION = "0.2.3"
   end
 end

data/lib/jamie/vagrant.rb

@@ -39,6 +39,14 @@ module Jamie
         @config = Jamie::Config.new
         @config.yaml_file = ENV['JAMIE_YAML'] if ENV['JAMIE_YAML']
       end
+
+      # Override default implementation to prevent serializing the config
+      # instance variable, which may contain circular references.
+      #
+      # @return [Hash] an empty Hash
+      def instance_variables_hash
+        {}
+      end
     end
 
     # Defines all Vagrant virtual machines, one for each instance.
@@ -53,7 +61,7 @@ module Jamie
     private
 
     def self.define_vagrant_vm(config, instance)
-      driver = instance.platform.driver
+      driver = instance.driver
 
       config.vm.define instance.name do |c|
         c.vm.box = driver['box']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jamie-vagrant
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,24 +9,24 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-30 00:00:00.000000000 Z
+date: 2013-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jamie
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.alpha19
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.1.0.alpha19
 - !ruby/object:Gem::Dependency
   name: vagrant
   requirement: !ruby/object:Gem::Requirement
@@ -122,7 +122,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 287715437133563140
+      hash: -3764330397802881782
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -131,7 +131,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 287715437133563140
+      hash: -3764330397802881782
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24