knife-github 0.0.8 → 0.0.9

data/lib/chef/knife/github_base.rb

@@ -17,7 +17,6 @@
 #
 
 # require 'chef/knife'
-require "knife-github/version"
 
 class Chef
   class Knife
@@ -29,7 +28,10 @@ class Chef
           deps do
             require 'chef/mixin/shell_out'
             require 'mixlib/versioning'
-            require 'chef/knife/github_config'
+            require 'knife-github/repo'
+            require 'knife-github/config'
+            require 'knife-github/version'
+            require 'knife-github/connection'
           end
 
           option :github_url,
@@ -38,7 +40,7 @@ class Chef
 
           option :github_organizations,
                  :long => "--github_org ORG:ORG",
-                 :description => "Lookup chef cookbooks in this colon-separated list of organizations",
+                 :description => "Lookup repositories in this colon-separated list of organizations",
                  :proc => lambda { |o| o.split(":") }
 
           option :github_link,
@@ -148,144 +150,77 @@ class Chef
             # Parse every org and merge all into one hash
             repos = {}
             orgs.each do |org|
-              get_repos(org).each { |repo| name = repo['name'] ; repos["#{name}"] = repo } 
+              get_org_data(org).each { |repo|
+                name = repo['name']
+                repos["#{name}"] = repo.to_hash 
+              } 
             end
             repos
           end
 
-          def get_repos(org)
-            dns_name  = get_dns_name(@github_url)
-            file_cache = "#{ENV['HOME']}/.chef/.#{dns_name.downcase}_#{org.downcase}" 
-
-            if File.exists?(file_cache + ".json")
-              json =  JSON.parse(File.read(file_cache + ".json"))
-              json_updated = Time.parse(json['updated_at'])
-              Chef::Log.info("#{org} - cache created at : " + json_updated.to_s)
-              repo_updated = get_org_updated_time(org)
-              Chef::Log.info("#{org} - repos updated at : " + repo_updated.to_s)
-        
-	      unless json_updated >= repo_updated 
-                # update cache file
-                create_cache_file(file_cache + ".cache", org)
-                create_cache_json(file_cache + ".json", org)
+          def get_org_data(org)
+            dns_name = get_dns_name(@github_url)
+            file = ENV['HOME'] + "/.chef/.#{dns_name}_#{org.downcase}.cache"
+
+            cache_repo_data  = get_cache_data(file)
+            github_repo_data = get_github_repo_data(org)
+      
+            github_repoList = Github::RepoList.new
+      
+            github_repo_data.each do |repo|
+              github_repoList.push(repo)
+              cache_repo = cache_repo_data.find { |k| k['name'] == repo.name }
+              if cache_repo
+                # found cache repo, update tags if latest_update is not equal
+                if repo.updated_at == cache_repo['updated_at']
+                  github_repoList.last.tags_all = cache_repo['tags_all']
+                  github_repoList.last.tags_last = cache_repo['tags_last']
+                else
+                  github_repoList.last.update_tags! 
+                end
+              else
+                # cannot find cache repo data, updating tags
+                github_repoList.last.update_tags!
               end
-            else
-              create_cache_file(file_cache + ".cache", org)
-              create_cache_json(file_cache + ".json", org)
             end
-            
-            # use cache files
-            JSON.parse(File.read(file_cache + ".cache"))
+            write_cache_data(file, github_repoList)
+            get_cache_data(file)
           end
-
-          def create_cache_json(file, org)
-            Chef::Log.debug("Updating the cache file: #{file}")
-            url  = @github_url + "/api/" + @github_api_version + "/orgs/" + org
-            params = {'response' => 'json'} 
-            result = send_request(url, params)
-            File.open(file, 'w') { |f| f.write(JSON.pretty_generate(result)) }
+          
+          def connection
+            @connection ||= GithubClient::Connection.new()
           end
 
-          def create_cache_file(file, org)
-            Chef::Log.debug("Updating the cache file: #{file}")
-            result = get_repos_github(org)
-            File.open(file, 'w') { |f| f.write(JSON.pretty_generate(result)) }
+          def write_cache_data(file, json)
+            File.open(file, 'w') { |f| f.write(json.to_pretty_json) }
           end
-         
-          def get_org_updated_time(org)
-            url  = @github_url + "/api/" + @github_api_version + "/orgs/" + org
-            params = {'response' => 'json'}
-            result = send_request(url, params)
-            Time.parse(result['updated_at'])
+      
+          def get_cache_data(file)
+            if File.exists?(file)
+              return JSON.parse(File.read(file))
+            else
+              return JSON.parse("{}")
+            end
           end
-
-          def get_repos_github(org)
-            # Get all repo's from cache file 
-
-            # Get all repo's for the org from github
+      
+          def get_github_repo_data(org)
             arr  = []
             page = 1
-            url  = @github_url + "/api/" + @github_api_version + "/orgs/" + org + "/repos" 
+            url  = @github_url + "/api/" + @github_api_version + "/orgs/" + org + "/repos"
             while true
               params = {'response' => 'json', 'page' => page }
-              result = send_request(url, params)
+              result = connection.send_get_request(url, params)
               break if result.nil? || result.count < 1
-              result.each { |key| arr << key }
+              result.each { |key| arr << Github::Repo.new(key) }
               page = page + 1
             end
-              # WE WILL REMOVE THIS, GETTING TAGS FOR EVERY REPO IS VERY SLOW!   
-              #  if key['tags_url']
-              #    tags = get_tags(key)
-              #    key['tags'] = tags unless tags.nil? || tags.empty?
-              #    key['latest_tag'] = get_latest_tag(tags)
-              #    arr << key
-              #  else 
-              #    arr << key 
-              #  end
-              #}
-            arr
+            return arr
           end
-
-          def get_tags(repo)
-            params = {'response' => 'json'}
-            send_request(repo['tags_url'], params)
-          end
-
-          def get_latest_tag(tags)
-            return "" if tags.nil? || tags.empty?
-            tags_arr =[]
-            tags.each do |tag|
-              tags_arr.push(Mixlib::Versioning.parse(tag['name'])) if tag['name'] =~ /^(\d*)\.(\d*)\.(\d*)$/
-            end
-            return "" if tags_arr.nil? || tags_arr.empty?
-            return tags_arr.sort.last.to_s
-          end
-
+      
           def get_dns_name(url)
             url = url.downcase.gsub("http://","") if url.downcase.start_with?("http://")
             url = url.downcase.gsub("https://","") if url.downcase.start_with?("https://")
-            url
-          end
-
-          def send_request(url, params = {})
-            unless params.empty?
-              params_arr = []
-              params.sort.each { |elem|
-                params_arr << elem[0].to_s + '=' + CGI.escape(elem[1].to_s).gsub('+', '%20').gsub(' ','%20')
-              }
-              data = params_arr.join('&')
-              url = "#{url}?#{data}" 
-            end
-
-            if @github_ssl_verify_mode == "verify_none"
-              config[:ssl_verify_mode] = :verify_none
-            elsif @github_ssl_verify_mode == "verify_peer"
-              config[:ssl_verify_mode] = :verify_peer
-            end
-
-            Chef::Log.debug("URL: " + url.to_s)
-
-            uri = URI.parse(url)
-            req_body = Net::HTTP::Get.new(uri.request_uri)
-            request = Chef::REST::RESTRequest.new("GET", uri, req_body, headers={})
- 
-            response = request.call
-          
-            unless response.is_a?(Net::HTTPOK) then
-              puts "Error #{response.code}: #{response.message}"
-              puts JSON.pretty_generate(JSON.parse(response.body))
-              puts "URL: #{url}"
-              exit 1
-            end
-
-            begin
-              json = JSON.parse(response.body)
-            rescue
-              ui.warn "The result on the RESTRequest is not in json format"
-              ui.warn "Output: " + response.body
-              exit 1
-            end
-            return json
+            url.downcase
           end
 
           def get_clone(url, cookbook)

data/lib/chef/knife/github_baselist.rb

@@ -16,9 +16,6 @@
 # limitations under the License.
 #
 
-
-require 'chef/knife'
-
 class Chef
   class Knife
     module GithubBaseList

data/lib/chef/knife/github_compare.rb

@@ -53,7 +53,7 @@ class Chef
 
         #Get the github link
         git_link = get_repo_clone_link
-
+ 
         # Filter all repo information based on the tags that we can find
         if config[:fields] || config[:fieldlist]
           all_repos = get_all_repos
@@ -68,7 +68,7 @@ class Chef
           else
             cookbooks.each { |k,v|
               get_all_repos[k].nil? || get_all_repos[k][git_link].nil? ? gh_url = ui.color("Cannot find cookbook!", :red) : gh_url = get_all_repos[k][git_link]
-              get_all_repos[k].nil? || get_all_repos[k]['latest_tag'].nil? || get_all_repos[k]['latest_tag'].empty? ? gh_tag = ui.color("No tags!", :red) : gh_tag = get_all_repos[k]['latest_tag']
+              get_all_repos[k].nil? || get_all_repos[k]['tags_last'].nil? || get_all_repos[k]['tags_last'].empty? ? gh_tag = ui.color("No tags!", :red) : gh_tag = get_all_repos[k]['tags_last']
               all_repos[k] = { 'name' => k, 'latest_cb_tag' => v['versions'][0]['version'], 'git_url' => gh_url, 'latest_gh_tag' => gh_tag }
             }
           end
@@ -92,7 +92,6 @@ class Chef
         end
 
       end
-
     end
   end
 end

data/lib/knife-github/connection.rb

@@ -0,0 +1,74 @@
+require 'json'
+require 'uri'
+require 'cgi'
+require 'openssl'
+require 'net/http'
+
+module GithubClient
+ class Connection
+    def send_get_request(url, params = {})
+      unless params.empty?
+        params_arr = []
+        params.sort.each { |elem|
+          params_arr << elem[0].to_s + '=' + CGI.escape(elem[1].to_s).gsub('+', '%20').gsub(' ','%20')
+        }
+        data = params_arr.join('&')
+        url = "#{url}?#{data}"
+      end
+
+      #if @github_ssl_verify_mode == "verify_none"
+      #  config[:ssl_verify_mode] = :verify_none
+      #elsif @github_ssl_verify_mode == "verify_peer"
+      #  config[:ssl_verify_mode] = :verify_peer
+      #end
+
+      Chef::Log.debug("URL: " + url.to_s)
+
+      uri = URI.parse(url)
+      http = http_client_builder.new(uri.host, uri.port)
+
+      if uri.scheme == "https"
+        http.use_ssl = true
+        http.verify_mode = OpenSSL::SSL::VERIFY_NONE
+      end
+  
+      request = Net::HTTP::Get.new(uri.request_uri)
+      response = http.request(request)
+
+      unless response.is_a?(Net::HTTPOK) then
+        puts "Error #{response.code}: #{response.message}"
+        puts JSON.pretty_generate(JSON.parse(response.body))
+        puts "URL: #{url}"
+        exit 1
+      end
+
+      begin
+        json = JSON.parse(response.body)
+      rescue
+        ui.warn "The result on the RESTRequest is not in json format"
+        ui.warn "Output: " + response.body
+        exit 1
+      end
+      return json
+    end
+
+    def http_client_builder
+      http_proxy = proxy_uri
+      if http_proxy.nil?
+        Net::HTTP
+      else
+        Chef::Log.debug("Using #{http_proxy.host}:#{http_proxy.port} for proxy")
+        user = http_proxy.user if http_proxy.user
+        pass = http_proxy.password if http_proxy.password
+        Net::HTTP.Proxy(http_proxy.host, http_proxy.port, user, pass)
+      end
+    end
+
+    def proxy_uri
+      return nil if @api_proxy.nil?
+      result = URI.parse(@api_proxy)
+      return result unless result.host.nil? || result.host.empty?
+      nil
+    end
+  end
+end

data/lib/knife-github/repo.rb

@@ -0,0 +1,162 @@
+require 'mixlib/versioning'
+require 'knife-github/connection'
+ 
+module Github
+  class Repo
+
+    def initialize(repo)
+    # Instance variables
+      @id          = repo['id']
+      @name        = repo['name']
+      @description = repo['description']
+      @full_name   = repo['full_name']
+      @private     = repo['private']
+      @homapage    = repo['homepage']
+      @created_at  = repo['created_at']
+      @updated_at  = repo['updated_at']
+      @pushed_at   = repo['pushed_at']
+      @html_url    = repo['html_url']
+      @ssh_url     = repo['ssh_url']
+      @git_url     = repo['git_url']
+      @svn_url     = repo['svn_url']
+      @clone_url   = repo['clone_url']
+      @tags_url    = repo['tags_url']
+      @tags_all    = repo['tags_all']
+      @tags_last   = repo['tags_last']
+    end
+ 
+    attr_reader :name, :id, :updated_at 
+    attr_writer :tags_all, :tags_last
+
+    def last_tag?
+      get_last_tag(@tags_all)
+    end
+
+    def to_s
+      @name
+    end
+    
+    def update_tags!
+      if @tags_url
+        @tags_all = get_tags(@tags_url)
+        @tags_last = get_last_tag(@tags_all)
+      end
+      self
+    end
+
+    def to_hash
+      { 
+        'id'          => @id,
+        'name'        => @name,
+        'description' => @description,
+        'full_name'   => @full_name,
+        'private'     => @private,
+        'homepage'    => @homepage,
+        'created_at'  => @created_at,
+        'updated_at'  => @updated_at,
+        'pushed_at'   => @pushed_at,
+        'html_url'    => @html_url,
+        'ssh_url'     => @ssh_url,
+        'git_url'     => @git_url,
+        'svn_url'     => @svn_url,
+        'clone_url'   => @clone_url,
+        'tags_url'    => @tags_url,
+        'tags_all'    => @tags_all,
+        'tags_last'   => @tags_last 
+      }
+    end
+
+    def get_repo_data(orgs)
+      orgs.each do |org| 
+        get_org_data(org)
+      end
+    end
+
+    private
+
+    def get_tags(url)
+      tags = []
+      result = connection.send_get_request(url)
+      result.each { |tag| tags.push(tag['name']) if tag['name'] =~ /^(\d*)\.(\d*)\.(\d*)$/ }
+      tags || nil
+    end
+ 
+    def get_last_tag(tags)
+      return nil if tags.nil? || tags.empty?
+      base, last = "0.0.0", nil
+      tags.each do |tag|
+        if Mixlib::Versioning.parse(tag) >= Mixlib::Versioning.parse(base)
+          last = tag
+          base = last
+        end
+      end
+      last
+    end
+
+    def connection
+      @connection ||= GithubClient::Connection.new()
+    end
+  end
+
+  class RepoList
+    def initialize
+      # Instance variables
+      @repos = Array.new
+    end
+ 
+    def push(aRepo)
+      pos = self.find_index(aRepo.name)
+      if pos
+        @repos[pos] = aRepo
+      else
+        @repos.push(aRepo)
+      end
+      self
+    end
+
+    def shift
+      @repos.shift
+    end
+
+    def pop
+      @repos.pop
+    end
+
+    def count
+      @repos.count
+    end
+
+    def delete(key)
+      @repos.delete(self.find(key))
+      self
+    end
+
+    def last
+      @repos.last
+    end
+
+    def find(key)
+      @repos.find { |aRepo| aRepo.name == key }
+    end
+
+    def find_index(key)
+      @repos.find_index { |aRepo| aRepo.name == key }
+    end
+
+    def [](key)
+      return @repos[key] if key.kind_of?(Integer)
+      return @repos.find { |aRepo| aRepo.name == key }
+      nil
+    end
+
+    def to_pretty_json
+      json = []
+      @repos.each do |repo|
+        json << repo.to_hash
+      end
+      JSON.pretty_generate(json)
+    end
+
+  end
+end
+

data/lib/knife-github/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Github
-    VERSION = "0.0.8"
+    VERSION = "0.0.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.0.8
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-11-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mixlib-versioning
@@ -91,13 +91,15 @@ files:
 - lib/chef/knife/github_cleanup.rb
 - lib/chef/knife/github_clone.rb
 - lib/chef/knife/github_compare.rb
-- lib/chef/knife/github_config.rb
 - lib/chef/knife/github_create.rb
 - lib/chef/knife/github_deploy.rb
 - lib/chef/knife/github_diff.rb
 - lib/chef/knife/github_list.rb
 - lib/chef/knife/github_pin.rb
 - lib/chef/knife/github_search.rb
+- lib/knife-github/config.rb
+- lib/knife-github/connection.rb
+- lib/knife-github/repo.rb
 - lib/knife-github/version.rb
 homepage: https://github.com/schubergphilis/knife-github
 licenses: