knife-github 0.1.6 → 0.1.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjM5M2RiM2MwOWRlY2U1YmUxMjMwYjk5NTgwOWNiZGQ3ODk3N2JmOA==
+    ZjllZDU0NzQ5NTgzNzExYzdiYTlhZGFkZjdiODhlYTUzOWEwZDk4Mw==
   data.tar.gz: !binary |-
-    MWQyMjFiNTliYWNkZTcyYjFhY2QzOWVjM2QyNjlkMGE0ZDI5NjgzMw==
+    MWJlZTY4ZDkwZWJkZjU3YTUzMzQ3YzA2MmUyMjVjNWRjNjg4NTJmMA==
 SHA512:
   metadata.gz: !binary |-
-    ZDE3NDk2NTBkODgzNzRlZTIxNzI1ZjI5YzRjYjhiYTQxZDQ2NWZiMWU3OGY2
-    ZWU0N2Y4YTE0NGNkYTE2ZDY1Y2M2NjdiODM1MzlmMjgxMzliMjlkYTUyMThj
-    MDM5NDQ1ZTk1NzA5YmMzOTdjN2FmNTM0OGVhYjJlNzNlNzQ4MzE=
+    ZTE5YzUyNjNjNWMxNjcxNjQyN2MyNzc0ODI0YTlmMzg0ZGU4NjQ1ODQ3YTQw
+    ZTZkMjZjNmM1YTYxZjBmMWU4NGY0MDUxODE3ZjQ3NjA2ZDE4YzlkNzgwYTM5
+    ZjI3MzkyNDNjOWFjNDAwYTZkMDJjMjJjZTAyYTg5OGJmOTNiZTA=
   data.tar.gz: !binary |-
-    MmRhYTdiZTA3ODAzNWUzMDA4NjRmZDE4MDhmYjFjN2Y2YjlhNGYzOGYyMGM1
-    OWVlMmRiZDliMDlkMzdmYmMwMjNmZDhmYWEwNTc0ZjE0MzA5ZWIyZWQ3NDlm
-    OWUxODRlODNkNWYyMDE4MjhmZjVhNzg5MjQ5NTM0Mjk1MGM1OWY=
+    OGEyNWI0NzU5NTQyZDYzYmJmZWFjMzk4NzJmYjk0YjQyYTI1MzhhZTQ3MWQ1
+    YWY0ZWI2NWRlY2ViZjRiZDcxMzljZWU3MGRiZTk5MWUxZjM5ZTVjMGRlMzVk
+    NDQ3MDZjMmRiYzYzOWIxOWM5MjU2ZmIxODUzOTIwYTAzN2RkM2M=

data/README.md

@@ -10,7 +10,7 @@ Configurations
 When working on customer admin machines, it's recommended to used an central configuration file.
 This file should be created in: /etc/githubrc.rb and can contain any attribute in the following structure:
 
-    github_url			        "https://github.schubergphilis.com"
+    github_url		        "https://github.schubergphilis.com"
     github_link             	"ssh"
     github_organizations    	[ "TLA-Cookbooks", "SBP-Cookbooks" ]
 
@@ -37,6 +37,9 @@ Here you can also use the github.com address if you don't have an internal appli
 Here you specify the organizations that you want to taget when searching for cookbooks.  
 The first entry will have priority over the other entries.
 
+###### github_proxy \<optional\>
+You can specify a proxy server in case you don't have direct internet access. If you have defined a proxy, github_link needs to be set to either hhtp or https. 
+
 ###### github_link \<optional\>
 You can specify the link type that you would like to use to download your cookbooks, default is <tt>ssh</tt>.   
 Options are <tt>ssh</tt> <tt>git</tt> <tt>http</tt> <tt>https</tt> <tt>svn</tt> 
@@ -52,8 +55,6 @@ Currently the options are: <tt>verify_peer</tt> <tt>verify_none</tt>
 Token information is required when creating and deleting github repositories.  
 With the command <tt>knife github token create</tt> you are able to create token information.
 
-###### github_proxy \<optional\>
-Used for HTTP communication over a proxy. 
 
 Other
 =====

data/lib/chef/knife/github_clone.rb

@@ -91,6 +91,14 @@ require 'chef/knife'
         end
 
  	github_url = repo[cookbook_name][repo_link]
+        token = get_github_token
+        if token.nil? || token.empty?
+          clone_url = github_url
+        else
+          uri = URI.parse(github_url)
+          uri.userinfo = "#{token}:x-oauth-basic"
+          clone_url = URI.join(uri)
+        end
         cookbook_path = get_cookbook_path(cookbook_name)
         if File.exists?(cookbook_path)
           ui.info("Processing [ SKIP    ] #{cookbook_name}")
@@ -98,7 +106,8 @@ require 'chef/knife'
         else
           ui.info("Processing [ CLONE   ] #{cookbook_name}")
           Chef::Log.info("Cloning repository to: #{cookbook_path}")
-          shell_out!("git clone #{github_url} #{cookbook_path}") 
+          Chef::Log.debug("Using url: #{clone_url}")
+          shell_out!("git clone #{clone_url} #{cookbook_path}") 
         end
       end
 

data/lib/knife-github/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Github
-    VERSION = "0.1.6"
+    VERSION = "0.1.7"
     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.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Sander Botman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-29 00:00:00.000000000 Z
+date: 2014-12-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning