vagrant-gitcredentials 0.0.21 → 0.0.22

data/lib/vagrant-gitcredentials/Util.rb

@@ -7,20 +7,26 @@ module VagrantPlugins
 				  script = ["GITHUB_USERNAME=$1", "GITHUB_PASSWORD=$2"]
 				  script.concat(["ssh-keygen -N '' -f ~/.ssh/github_rsa", "ssh-add ~/.ssh/github_rsa"])
 				  script.concat(["set -- $(<~/.ssh/github_rsa.pub)", 'JSON=\'{"title":"vagrant provision key", "key": "ssh-rsa \'$2\'"}\''])
-				  script.concat(['curl -u "$GITHUB_USERNAME:$GITHUB_PASSWORD" -d "$JSON" https://api.github.com/user/keys'])
-				  @machine.communicate.execute("echo '' > ~/.ssh/github.sh")
-				  # create script
-				  script.each {
-					|l|
-					e = Shellwords.escape(l);
-					@machine.communicate.execute("echo #{e} >> ~/.ssh/github.sh")
-				  }
-				  # set permissions for execution
-				  @machine.communicate.execute("chmod 755 ~/.ssh/github.sh")
-				  @machine.communicate.execute("cat ~/.ssh/github.sh")
-				  # execute script w/ permissions
-				  promptCredentials()				
-				  @machine.communicate.execute("sh ~/.ssh/github.sh #@gitUsername #@gitPassword")
+				  script.concat(['curl -u "$GITHUB_USERNAME:$GITHUB_PASSWORD" -d "$JSON" https://api.github.com/user/keys > ~/.ssh/git.response'])
+				
+				  # if we have a successful response, skip generating key
+				  unless @machine.communicate.test('grep '"id"' ~/.ssh/git.response')
+						
+				    @machine.communicate.execute("echo '' > ~/.ssh/github.sh")
+				    # create script
+				    script.each {
+				  	  |l|
+					  e = Shellwords.escape(l);
+					  @machine.communicate.execute("echo #{e} >> ~/.ssh/github.sh")
+				    }
+				    # set permissions for execution
+				    @machine.communicate.execute("chmod 755 ~/.ssh/github.sh")
+				    @machine.communicate.execute("cat ~/.ssh/github.sh")
+				    # execute script w/ permissions
+				    promptCredentials()				
+				    @machine.communicate.execute("sh ~/.ssh/github.sh #@gitUsername #@gitPassword")
+				  end
+				
 				  @machine.communicate.execute("sh /vagrant_shared/build/scripts/recipies/github.sh")
 
 				@ui.info("created ssh key")

data/lib/vagrant-gitcredentials/version.rb

@@ -1,5 +1,5 @@
 module VagrantPlugins
   module GitCredentials
-    VERSION = "0.0.21"
+    VERSION = "0.0.22"
   end
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 21
-  version: 0.0.21
+  - 22
+  version: 0.0.22
 platform: ruby
 authors: 
 - Jeremy Giberson