tanuki-universe 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f56b4a6cfc038b35090d24940243f9bc504304de
-  data.tar.gz: 34dbac62871e7b97641a728392359a42faa256b0
+SHA256:
+  metadata.gz: 9920783171c049d992a661b72817e0258aeec32011e7e6543100fea62c316e3b
+  data.tar.gz: 9a7b5df0e46325aed6ce43e363e50d3b148e98802c0216fddd81fa73855914f3
 SHA512:
-  metadata.gz: 5d176303ac2b497f7032a48111942a330a91a0550773162e8e86a6fe996e826a44efe3fc9e46165dcad4d542beec572674efd509a6bdc65e113e935374acf996
-  data.tar.gz: b0d6937732e25a76e1c3b940477a624b7da4db4b70fb97fbe408e1e6611ad3f4ab572c53613a3e627c7f76c2014fe07900941cf2a6379b82af69d8fdb907c65c
+  metadata.gz: 2a8f44feea09c1785b54ea9441ffd91006d4532de4bd7d65d42279b3eb92a6ddf92195e1c58807164ec756cea72a9268a8d76f365612a7728ac875d9a35455f6
+  data.tar.gz: 8ff47d43962de7b893617d3ff4273cab154b6d6ec2c925f534e4a9c5e795bde20b0c2bd7440eed71935be5135ae98685dfc6783b350be541f785758a0e49b546

data/.gitignore

@@ -12,3 +12,4 @@
 .rspec_status
 
 vendor/
+config.json

data/Gemfile

@@ -2,5 +2,3 @@ source 'https://rubygems.org'
 
 # Specify your gem's dependencies in tanuki-universe.gemspec
 gemspec
-
-gem 'gitlab', git: 'https://github.com/NARKOZ/gitlab.git'

data/README.md

@@ -4,14 +4,6 @@ Generate universe file from private Gitlab.
 
 Please see the following URL(https://docs.chef.io/api_chef_server.html#universe).
 
-## Caution(2017/11/09)⚠️
-
-Please add this to Gemfile.
-```
-gem 'gitlab', git: 'https://github.com/NARKOZ/gitlab.git'
-```
-It needs to be obtained from master branch to require fixes not included in the latest release.
-
 
 
 ## Installation

data/lib/tanuki/universe/commands/generate.rb

@@ -23,36 +23,39 @@ module Tanuki
           universe = {}
 
           gitlab = Tanuki::Universe::GitlabClient.new(endpoint['options'])
-          gitlab.projects.auto_paginate do |project|
-            versions = {}
-
-            git_tags = gitlab.get_git_tags(project.id)
-            next if git_tags.count == 0
-
-            git_tags.each do |tag|
-              
-              begin
-              metadata = gitlab.get_metadata(project.id, tag.name)
-              rescue Exception => e
-                next if e.message == "undefined method `message' for {\"message\"=>\"404 File Not Found\"}:Hash"
-              end
+          groups = gitlab.get_groups
+          groups.each do |g|
+            group = gitlab.get_projects(g.id)
+            projects = group.projects
+            projects.each do |project|
+              versions = {}
           
-              parse_metadata(metadata)
-
-              dependencies_hash = Hash.new { |h,k| h[k] = {} }
-              if @dependencies.count == 0
-                dependencies_hash["dependencies"] = {}
-              end
-              @dependencies.each do |k, v|
-                v = '>= 0.0.0' if v.empty?
-                dependencies_hash["dependencies"] = dependencies_hash["dependencies"].update({k => v})
+              git_tags = gitlab.get_git_tags(project['id'])
+              next if git_tags.count == 0
+          
+              git_tags.each do |tag|
+                begin
+                metadata = gitlab.get_metadata(project['id'], tag.name)
+                rescue Exception => e
+                  next if e.message == "undefined method `message' for {\"message\"=>\"404 File Not Found\"}:Hash"
+                end
+                parse_metadata(metadata)
+          
+                dependencies_hash = Hash.new { |h,k| h[k] = {} }
+                if @dependencies.count == 0
+                  dependencies_hash["dependencies"] = {}
+                end
+                @dependencies.each do |k, v|
+                  v = '>= 0.0.0' if v.empty?
+                  dependencies_hash["dependencies"] = dependencies_hash["dependencies"].update({k => v})
+                end
+                @location_path = project['web_url'] + '/repository/archive.tar.gz?ref=v' + @version
+          
+                versions = versions.update({ @version => { "location_path" => @location_path, "location_type" => endpoint['type'] }.update(dependencies_hash)})
               end
-              @location_path = project.web_url + '/repository/archive.tar.gz?ref=v' + @version
-              
-              versions = versions.update({ @version => { "location_path" => @location_path, "location_type" => endpoint['type'] }.update(dependencies_hash)})
+              universe = universe.update({@cookbook_name => versions })
             end
-            universe = universe.update({@cookbook_name => versions })
-          end
+          end 
 
           json_str = JSON.pretty_generate(universe)
           puts json_str

data/lib/tanuki/universe/gitlab_client.rb

@@ -6,23 +6,26 @@ module Tanuki
 
       GITLAB_API_VERSION = 'v4'
 
-      attr_reader :group, :private_token, :url, :projects
+      attr_reader :projects
 
       def initialize(options)
         parse_options(options)
-        endpoint = "#{@url}api/#{GITLAB_API_VERSION}"
-        @client = Gitlab.client(endpoint: endpoint, private_token: @private_token)
-        get_projects
+        endpoint = "#{@opt_url}api/#{GITLAB_API_VERSION}"
+        @client = Gitlab.client(endpoint: endpoint, private_token: @opt_private_token)
       end
 
       def parse_options(options)
-        @group = ENV['GITLAB_COOKBOOKS_GROUP'] || options['group']
-        @private_token = ENV['GITLAB_API_PRIVATE_TOKEN'] || options['private_token']
-        @url = ENV['GITLAB_API_ENDPOINT'] || options['url']
+        @opt_group = ENV['GITLAB_COOKBOOKS_GROUP'] || options['group']
+        @opt_private_token = ENV['GITLAB_API_PRIVATE_TOKEN'] || options['private_token']
+        @opt_url = ENV['GITLAB_API_ENDPOINT'] || options['url']
       end
       
-      def get_projects
-        @projects = @client.project_search(@group)
+      def get_groups
+        @opt_groups = @client.group_search(@opt_group)
+      end
+
+      def get_projects(group_id)
+         @projects = @client.group(group_id)
       end
 
       def get_git_tags(project_id)

data/lib/tanuki/universe/version.rb

@@ -1,5 +1,5 @@
 module Tanuki
   module Universe
-    VERSION = "0.0.4"
+    VERSION = "0.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tanuki-universe
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - kubihie
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-11-09 00:00:00.000000000 Z
+date: 2018-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gitlab
@@ -99,7 +99,6 @@ files:
 - bin/console
 - bin/setup
 - bin/tanuki-universe
-- config.json
 - lib/tanuki/universe.rb
 - lib/tanuki/universe/.DS_Store
 - lib/tanuki/universe/cli.rb
@@ -128,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Generate a universe file for Gitlab.

data/config.json

@@ -1,8 +0,0 @@
-{
-  "endpoints": [
-    {
-      "type": "gitlab",
-      "options": {}
-    }
-  ]
-}