vagrant-saltdeps 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c3385ebff36389fd3b03ca93e2dc2558e8cc579
-  data.tar.gz: 48075e3ee445f6747a45d40b1f46077386cca5f8
+  metadata.gz: a084e08cb862e706875409f3a247fd55b6145f61
+  data.tar.gz: 1fd41fb43515be16d54a97296d884ee5bd0dae47
 SHA512:
-  metadata.gz: 9a899f21de185ea70d1360dcf37e211d999250b4c19d94a51dc3f4644cb2d9f052a449b9bdfd4b32cd5e059a5d29ddae26f7976dd56c0d25d420d73d4baf86d9
-  data.tar.gz: 8183c8f4e318ff4dab188260f92d32986483440f144e26fc8d839bd22d2a50208b561afbb71d282264e2c6483be905627e7e0576969cfc83caa7bbe7220082e2
+  metadata.gz: add517692243b15c96a32e829ab2bb3c055233378f442edea940ebb3dd7c8b69d244b8dd869ac46bb959f7196027c518e8a9da6f479e3e16d07af9f22aee733f
+  data.tar.gz: e92e89b63f028237bfa101fd0d431b1a5f52629b3a68b2531f889f76d33b88515f15f82fdd5a59248a46910101372a169f05d1be050a97df0ef4b83a434663fb

data/.gitignore

@@ -32,3 +32,6 @@ build/
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
 .rvmrc
+
+.idea/
+*.iml

data/CHANGLOG.md

@@ -1,3 +1,15 @@
+## 1.0.4 (2015-04-03)
+
+ErrorHandling:
+
+  - exit on error if the branch defined in saltdeps.yml does not exist in the repository.
+
+## 1.0.3 (2015-04-03)
+
+Bugfixes:
+
+  - when a branch is defined for a repository in saltdeps.yml, do a checkout of the remote branch.
+
 ## 1.0.2 (2015-03-31)
 
 Bugfixes:

data/lib/vagrant-saltdeps/errors.rb

@@ -0,0 +1,12 @@
+
+
+module VagrantPlugins
+  module Saltdeps
+    class GitCheckoutError < Vagrant::Errors::VagrantError
+      error_key "git_checkout_error"
+    end
+    class UnknownException < Vagrant::Errors::VagrantError
+      error_key "unknown_error"
+    end
+  end
+end

data/lib/vagrant-saltdeps/provisioner.rb

@@ -3,7 +3,7 @@ require 'vagrant'
 require 'git'
 require 'fileutils'
 require "log4r"
-
+require_relative 'errors'
 
 module VagrantPlugins
   module Saltdeps
@@ -40,8 +40,12 @@ module VagrantPlugins
           else
             g = Git.clone(uri, name, path: @checkout_path)
           end
-          g.checkout(branch)
-          g.pull
+          begin
+            g.checkout(branch)
+            g.pull
+          rescue  Git::GitExecuteError => e
+            raise GitCheckoutError.new :branch => branch, :message => e.message
+          end
         end
       end
 

data/lib/vagrant-saltdeps/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module Saltdeps
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
   end
 end

data/lib/vagrant-saltdeps.rb

@@ -6,6 +6,6 @@ module VagrantPlugins
     def self.source_root
       @source_root ||= Pathname.new(File.expand_path("../../", __FILE__))
     end
-    
-  end
+     I18n.load_path += Dir[File.expand_path("../../locales/*{rb,yml}", __FILE__)]
+   end
 end

data/locales/en.yml

@@ -0,0 +1,15 @@
+en:
+  vagrant:
+    errors:
+      git_checkout_error: |-
+        Saltdeps experienced a git error checking out branch '%{branch}'.
+        Are you sure that branch defined in saltdeps.yml exists in the repository?
+
+        git returned:
+
+        %{message}
+
+      unknown_error: |-
+        Saldeps experienced an unknown error. The message was:
+
+        %{message}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: vagrant-saltdeps
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - Joseph Hughes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-03 00:00:00.000000000 Z
+date: 2015-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: git
@@ -83,9 +83,11 @@ files:
 - Rakefile
 - lib/vagrant-saltdeps.rb
 - lib/vagrant-saltdeps/config.rb
+- lib/vagrant-saltdeps/errors.rb
 - lib/vagrant-saltdeps/plugin.rb
 - lib/vagrant-saltdeps/provisioner.rb
 - lib/vagrant-saltdeps/version.rb
+- locales/en.yml
 - vagrant-saltdeps.gemspec
 homepage: https://github.com/joshughes/vagrant-Saltdeps
 licenses: