knife-github 0.1.8 → 0.1.9

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjlkZjA5N2EwMzNiMTllZjkxY2I1MmQyNjE3MjhjZjFhYzRlN2Y0Ng==
+    ZWUwODg1N2Y4MTRjNjBkNDRkMTgxNWUxZmNmMDlmYzAwZmE4YWRmYw==
   data.tar.gz: !binary |-
-    ZGE0NGViMjM1ODY5ZGU0NzU3ZGJhYzY0NGZkYjkyZjI5MWJlZDI3YQ==
+    NDBjNmYxOGVmYzUyYmI0NDRkN2ZhMGY5NGU4NWJmZmRiZWQ4YWQzMg==
 SHA512:
   metadata.gz: !binary |-
-    M2Q3ZDMyNGFlZWMxNDFjYzFhOGRjNmQyMzE4NDhhYTkzZGNkYjllMDY3N2U2
-    MTc0OWMyNWJkZjFmMDQ0YWJhNGEzM2QyZGNjZTg4NzBjZjMzYTAxZWVlYTgy
-    ZTg0MjM4YmQ5NWQ4ZGQxMmIwZDI0NjAzNDMxNjIwMGZkNDk5MGI=
+    ZmQ2Y2Q3OWZjYjdjNjk0ZjBiMDk2ZDY3N2MyY2JjYmUwZTc1OTYwNzRkNTFj
+    M2E0MWUyMzYyMTMzYWI1NGM3ZmQ3ZjRjYmY0OGFhNmFhNDY0YTAzODA5NmYx
+    ZTExYTQxMDA3ZTIxZWM1YzdkNWY1NWFmOGRiNzk2OTIzYmUyODc=
   data.tar.gz: !binary |-
-    YjU1NWE3ZjY1MjdmNWNlN2UxYmQ5MjdkNTljMjMwYTE0YTkwMzI1NjBkMzA3
-    ZjNlYzcxYTNmYmIzYzk3ZmZiMTU5ODAxMGYxNjFiNWFmMWU4ODg2OWQ5YjVl
-    NDVlZDllYjVmOTJjZWNhYzU1ZDg5Y2Q3N2ZiNWM3ODQyNWFkMWQ=
+    NWE3OGFhOWVkMThmOTYzNTQxOTRjMDNlYTdlZWI1ZDQ0YWM4Njc0Zjc0MzM2
+    MDJiNDNmZjdiYmRlMGU3YWQxMzNiOTYyNTAyZjIwYWE0Zjg0OWIwOGEzODhk
+    NzYwZjZhMmYzZjdiMDRiMWUzMmQ1MDJhYmY0NDhjOTA0YTg0MDc=

data/lib/chef/knife/github_repo_create.rb

@@ -102,11 +102,22 @@ module KnifeGithubRepoCreate
         # Creating the github repository
         Chef::Log.debug("Creating the github repository")
         repo = connection.request(params)
-        github_ssh_url = repo['ssh_url']
-    
-        Chef::Log.debug("Commit and push local repository")
+        if @github_url =~ /^https:\/\/.*$/
+          token = get_github_token
+          if token.nil? || token.empty?
+            github_connection_url = repo['html_url']
+          else
+            uri = URI.parse(repo['html_url'])
+            uri.userinfo = "#{token}:x-oauth-basic"
+            github_connection_url = URI.join(uri)
+          end
+        else
+          github_connection_url = repo['ssh_url']
+        end
+ 
+        Chef::Log.debug("Commit and push local repository, using URL: #{github_connection_url}")
         # Initialize the local git repo
-        git_commit_and_push(cookbook_dir, github_ssh_url)
+        git_commit_and_push(cookbook_dir, github_connection_url)
 
         puts "Finished creating #{name} and uploading #{cookbook_dir}"
       else
@@ -121,11 +132,22 @@ module KnifeGithubRepoCreate
         # Creating the github repository
         Chef::Log.debug("Creating the github repository")
         repo = connection.request(params)
-        github_ssh_url = repo['ssh_url']
-  
-        Chef::Log.debug("Commit and push local repository")      
+        if @github_url =~ /^https:\/\/.*$/
+          token = get_github_token
+          if token.nil? || token.empty?
+            github_connection_url = repo['html_url']
+          else
+            uri = URI.parse(repo['html_url'])
+            uri.userinfo = "#{token}:x-oauth-basic"
+            github_connection_url = URI.join(uri)
+          end
+        else
+          github_connection_url = repo['ssh_url']
+        end
+
+        Chef::Log.debug("Commit and push local repository, using URL: #{github_connection_url}")
         # Initialize the local git repo
-        git_commit_and_push(cookbook_dir, github_ssh_url)
+        git_commit_and_push(cookbook_dir, github_connection_url)
   
         Chef::Log.debug("Removing temp files")
         FileUtils.remove_entry(@github_tmp)
@@ -184,8 +206,8 @@ module KnifeGithubRepoCreate
 
     # Set the username in README.md
     # @param cookbook_path [String] cookbook path
-    #        github_ssh_url [String] github ssh url from repo
-    def git_commit_and_push(cookbook_path, github_ssh_url)
+    #        github_url [String] github ssh url from repo
+    def git_commit_and_push(cookbook_path, github_url)
       if File.exists?(File.join(cookbook_path, ".git"))
         shell_out("git remote rm origin", :cwd => cookbook_path)
       else  
@@ -194,7 +216,7 @@ module KnifeGithubRepoCreate
       shell_out!("echo - $(date): Uploaded with knife github plugin. >> CHANGELOG.md ", :cwd => cookbook_path)
       shell_out!("git add .", :cwd => cookbook_path) 
       shell_out!("git commit -m 'creating initial cookbook structure from the knife-github plugin' ", :cwd => cookbook_path) 
-      shell_out!("git remote add origin #{github_ssh_url} ", :cwd => cookbook_path) 
+      shell_out!("git remote add origin #{github_url} ", :cwd => cookbook_path) 
       shell_out!("git push -u origin master", :cwd => cookbook_path) 
     end
 

data/lib/knife-github/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Github
-    VERSION = "0.1.8"
+    VERSION = "0.1.9"
     MAJOR, MINOR, TINY = VERSION.split('.')
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-github
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Sander Botman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-04 00:00:00.000000000 Z
+date: 2015-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning