vagrant-adam 0.3.0a → 0.4.0a

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ac99722c8b167642e4b9d0628aa8c84412127bf2
-  data.tar.gz: 08afa21f86b4136fb2d155575089b002704341e1
+  metadata.gz: 05938e38f2d43c0e8c7dc8f65023b43933c2a6f3
+  data.tar.gz: 08a2a3e40f847c6ecbb61a3ea79dfdc243920eb9
 SHA512:
-  metadata.gz: c9d5f4782cf60436927cdc7f8e9773140ebf49342a1e490a9cca1b073048e2e400293061eb3edd02e9306cb1c6087a2dcc16293567cb8ad397a76008abcfd643
-  data.tar.gz: 82e3d13591794168b18465b2f84c883923f0dba38f7499b8d25827e44504a164cbf361d7fe3dc2eb0e9652c0feba43d04dee93089abb13ba1300c1818c471369
+  metadata.gz: a0141523a6c04ef07a10b88c1628d21f3678660ec4580e5c91d3300f4781b7b2588b129d5f15e85288e41651e1be6de4a366963aee5b5c7f8a3b10f76a219b83
+  data.tar.gz: a322a1a794a4c602a0e981243b0db423bfb7c785c394bd1bc95bb80ea375ec4165586f770929dc288696a12aa24e5d3c7c6d6f2036d25eb83b866089c63f72db

data/features/vagrant-adam/basic_local_file.feature

@@ -23,3 +23,8 @@ Feature: vagrant-adam local file
     And a shell file 'hello_world_local_file.sh' with content of "echo 'Hello World!'"
     And the Vagrant box is already running
     Then the provision output should contain "Hello World"
+
+  Scenario:
+    Given a Vagrantfile with no adam.provision_url
+    When I run `bundle exec vagrant up`
+    Then the exit status should not be 1

data/features/vagrant-adam/validations.feature

@@ -10,11 +10,17 @@ Feature: vagrant-adam validations
     Then the exit status should not be 0
     And the output should contain "The requested URL returned error: 404 Not Found"
 
+  Scenario: raises error if url of file doesnt exist
+    Given a Vagrantfile with a adam.provision_url of "https://@@@@@fakeurl...."
+    When I run `bundle exec vagrant up`
+    Then the exit status should not be 0
+    And the output should contain "'https://@@@@@fakeurl....' is not a valid URL"
+
   Scenario: raises error if path of file doesnt exist
     Given a Vagrantfile with a adam.provision_url of "/tmp/foo_bar_baz.sh"
     When I run `bundle exec vagrant up`
     Then the exit status should not be 0
-    And the output should contain "Couldn't open file /tmp/foo_bar_baz.sh"
+    And the output should contain "File '/tmp/foo_bar_baz.sh' could not be found."
 
   Scenario:
     Given a Vagrantfile with no adam.provision_url

data/lib/vagrant-adam/action/pre_provision_script.rb

@@ -20,9 +20,17 @@ module VagrantPlugins
 
         def call(env)
           @app.call(env)
-          fetch_or_create_pre_provision_script(env)
-          run_provision_script(env)
-          recover(env)
+
+          return unless @machine.communicate.ready? && provision_enabled?(env)
+
+          # Perform delayed validation
+          @machine.config.adam.validate!(@machine)
+
+          unless @provision_script.nil?
+            fetch_or_create_pre_provision_script(env)
+            run_provision_script(env)
+            recover(env)
+          end
         end
 
         private

data/lib/vagrant-adam/config.rb

@@ -21,10 +21,18 @@ module VagrantPlugins
 
         unless @provision_url.nil?
           unless (valid_uri? @provision_url) || (valid_file? @provision_url)
-            msg = <<-EOH
-'#{ @provision_url }' is not a valid filepath or URL
-            EOH
-            errors << msg
+            unless (valid_uri? @provision_url)
+              msg = <<-EOH
+  '#{ @provision_url }' is not a valid URL
+              EOH
+              errors << msg
+            end
+            unless (valid_file? @provision_url)
+              msg = <<-EOH
+  File '#{ @provision_url }' could not be found.
+              EOH
+              errors << msg
+            end
           end
         end
 

data/lib/vagrant-adam/version.rb

@@ -1,6 +1,6 @@
 module VagrantPlugins
   # Define version for Gem here
   module Adam
-    VERSION = '0.3.0a'
+    VERSION = '0.4.0a'
   end
 end

data/spec/unit/vagrant-puppet-install/action/pre_provision_script_spec.rb

@@ -13,7 +13,10 @@ describe VagrantPlugins::Adam::Action::PreProvisionScript do
     double('machine').tap { |machine| machine.stub(config: config, communicate: communicate) }
   end
   let(:communicate) do
-    double('communicate').tap { |machine| machine.stub(upload: upload) }
+    double('communicate').tap { |communicate| communicate.stub(upload: upload, ready?: ready?) }
+  end
+  let(:ready?) do
+    double('ready?')
   end
   let(:upload) do
     double('upload')
@@ -25,7 +28,7 @@ describe VagrantPlugins::Adam::Action::PreProvisionScript do
     double('vm').tap { |config| config.stub(guest: 'guest') }
   end
   let(:adam) do
-    double('adam').tap { |config| config.stub(:finalize! => true, :provision_url => '/tmp/config.sh') }
+    double('adam').tap { |config| config.stub(:finalize! => true, :provision_url => '/tmp/config.sh', :validate! => true,) }
   end
 
   describe '#initialize' do
@@ -34,7 +37,7 @@ describe VagrantPlugins::Adam::Action::PreProvisionScript do
   end
 
   describe '#call' do
-    context 'when called' do
+    context 'when called with config set' do
       subject(:pre_provision_script) { described_class.new(app, env) }
       it 'should fetch the script, then run it' do
         pre_provision_script.should_receive(:fetch_or_create_pre_provision_script).with(env)
@@ -42,6 +45,18 @@ describe VagrantPlugins::Adam::Action::PreProvisionScript do
         pre_provision_script.call(env)
       end
     end
+
+    context 'when called without config set' do
+      subject(:pre_provision_script) { described_class.new(app, env) }
+      let(:adam) do
+        double('adam').tap { |config| config.stub(:finalize! => true, :provision_url => nil, :validate! => true) }
+      end
+      it 'exit early' do
+        pre_provision_script.should_not_receive(:fetch_or_create_pre_provision_script).with(env)
+        pre_provision_script.should_not_receive(:run_provision_script).with(env)
+        pre_provision_script.call(env)
+      end
+    end
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-adam
 version: !ruby/object:Gem::Version
-  version: 0.3.0a
+  version: 0.4.0a
 platform: ruby
 authors:
 - Peter Souter
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-17 00:00:00.000000000 Z
+date: 2014-10-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler