berktacular 0.1.7 → 1.0.0

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    MDFmMmEyZGYyYzFhNTYzYWM4YTAyMjNkMjZiODU1ZjZiMzEyMzg3MA==
-  data.tar.gz: !binary |-
-    ZDZhYWRhMDM3MmIxMzM3M2ZmYzE0NTVmNzgyMWQ4MjgyN2VlNTMzNQ==
+SHA1:
+  metadata.gz: f6406cbc6a3da17b4bf06d75953d84b6ab648b08
+  data.tar.gz: f05fdf6ac3fc1087f94b0147280c254d083f4f0f
 SHA512:
-  metadata.gz: !binary |-
-    MmY5YmEwYzkzYzIwZjlhMjU4YzhkZTZmNzFhY2FhMWUwODc3Y2QyOGM1YzUy
-    NWI1OWRjZTk4YjZkZDJkNGI1OGRiOTUwMzZmZDhiNGI2YTYzMGY4YWFiNGM5
-    ZTFhYTMwMGNlNjhhMThjMjI0NDNiMjIxZWEzMjdkM2Q2OGE1YTI=
-  data.tar.gz: !binary |-
-    YmRkMzhhMDY0ZWQ3NTQ5Yzc1NDY2MjI1MmQxZmY1YjBmZmY0MDhjMGI0ZDU5
-    MzJiYzBiMGQ4ZjYyYTNjNGI0YWIyM2ZjOThiOGFhODE3ZjZjYjUzM2JmMWQw
-    YTUzNDg0ZDYwMjAwZmFjOWEwNDlmZDM4MzBjNGIwMjM4MWZmNzU=
+  metadata.gz: e4c097ae8d61574ea027f200ab651294b3f3045dce6e81434e6f7b8c55f16b5476ae6d0f15770c1b15afe06eca9592c2e2c16be0bc71f994dd4da71fe21a7600
+  data.tar.gz: 5b3c6047f2c51cd241423ea341586273b14e3b5f2940b14a678bc11bdd0c2a9e9f314533b48cb612cb5aee1ace1a27706752ecd1417c9e410f4a8505f098c67a

data/VERSION

@@ -0,0 +1 @@
+1.0.0

data/bin/berktacular

@@ -19,6 +19,8 @@ berks_conf  = nil
 knife_conf  = nil
 workdir     = nil
 verbose     = false
+source_list = []
+versions_only = false
 
 options =  OptionParser.new do |opts|
   opts.banner = "Read environment json file and spit out a berksfile"
@@ -66,9 +68,21 @@ options =  OptionParser.new do |opts|
     workdir = w
     preserve = true
   end
+  opts.on("-s", "--source SOURCE", String,
+    "Add this source to the generated Berksfile in addition to the default source",
+    "(https://api.berkshelf.com). This may be e.g. an internal Berkshelf API server URL.",
+    "This option can be used multiple times. Custom sources are always included before the ",
+    "default source, unless the default source is explicitly specified using this option.") do |s|
+    source_list << s
+  end
   opts.on("-v", "--verbose", "Turn on verbose output" ) do
     verbose = true
   end
+  opts.on("--versions-only",
+    "Include only cookbook versions in the Berksfile (no protocol or git URL).",
+    "This can be used with --source to download cookbooks using an API server.") do
+    versions_only = true
+  end
   opts.on("--version", "Print the version and exit" ) do
     puts Berktacular::VERSION
     exit 0
@@ -97,6 +111,10 @@ unless env_file && File.exist?(env_file)
 end
 
 my_env = JSON.parse( File.read( env_file ) )
+if versions_only
+  # Ignore cookbook locations. Only include versions in the generated Berksfile.
+  my_env.delete('cookbook_locations')
+end
 
 unless github_token
   if File.exists? gtoken_path
@@ -129,9 +147,15 @@ puts "Using workdir: '#{workdir}'" if verbose
 
 # Create a new berksfile
 puts "Checking updates, this can take some time..." if check || upgrade
-b = Berktacular::Berksfile.new(my_env, upgrade: upgrade, github_token: github_token, verbose: verbose)
-b.check_updates           if check
-puts "#{b}"               if printit
+b = Berktacular::Berksfile.new(
+  my_env,
+  upgrade: upgrade,
+  github_token: github_token,
+  verbose: verbose,
+  source_list: source_list
+)
+b.check_updates if check
+puts "#{b}" if printit
 if berksfile
   FileUtils.mkdir_p( File.dirname(berksfile) )
   File.write(berksfile, b)

data/lib/berktacular/berksfile.rb

@@ -1,3 +1,6 @@
+require 'ostruct'
+require 'json'
+
 module Berktacular
 
   # This class represents a Berksfile
@@ -20,6 +23,8 @@ module Berktacular
     # @option opts [String] :github_token (nil) the github token to use.
     # @option opts [True,False] :upgrade (False) whether or not to check for upgraded cookbooks.
     # @option opts [True,False] :verbose (False) be more verbose.
+    # @option opts [Array<String>] :source_list additional Berkshelf API sources to include in the
+    #   generated Berksfile.
     def initialize( environment, opts = {})
       @env_hash           = environment # Save the whole thing so we can emit an updated version if needed.
       @name               = environment['name']               || nil
@@ -29,11 +34,13 @@ module Berktacular
       @opts = {
         :upgrade      => opts.has_key?(:upgrade)      ? opts[:upgrade]      : false,
         :github_token => opts.has_key?(:github_token) ? opts[:github_token] : nil,
-        :verbose      => opts.has_key?(:verbose)      ? opts[:verbose]      : false
+        :verbose      => opts.has_key?(:verbose)      ? opts[:verbose]      : false,
+        :source_list  => opts.has_key?(:source_list)  ? opts[:source_list]  : []
       }
       @installed = {}
       # only connect once, pass the client to each cookbook.  and only if needed
       connect_to_git if @opts[:upgrade]
+      @opts[:source_list] = (@opts[:source_list] + ["https://api.berkshelf.com"]).uniq
     end
 
     # @return [Hash] representation of the env_file.
@@ -71,7 +78,7 @@ module Berktacular
         cookbooks = File.join(workdir, "cookbooks")
         FileUtils.rm(lck) if File.exists? lck
         File.write(berksfile, self)
-        Berktacular.run_command("berks install --berksfile #{berksfile} --path #{cookbooks}")
+        Berktacular.run_command("berks vendor --berksfile #{berksfile} #{cookbooks}")
         @installed[workdir] = {berksfile: berksfile, lck: lck, cookbooks: cookbooks}
       end
       workdir
@@ -87,10 +94,14 @@ module Berktacular
       dependencies  = {}
       Dir["#{@installed[workdir][:cookbooks]}/*"].each do |cookbook_dir|
         next unless File.directory?(cookbook_dir)
-        metadata_path   = File.join(cookbook_dir, 'metadata.rb')
-        metadata        = Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
-        cookbook_name   = metadata.name
-        name_from_path  = File.basename(cookbook_dir)
+        metadata_candidates = ['rb', 'json'].map {|ext| File.join(cookbook_dir, "metadata.#{ext}") }
+        metadata_path = metadata_candidates.find {|f| File.exists?(f) }
+        raise "Metadata file not found: #{metadata_candidates}" if metadata_path.nil?
+        metadata =
+          metadata_path =~ /\.json$/ ? metadata_from_json(IO.read(metadata_path)) :
+            Ridley::Chef::Cookbook::Metadata.from_file(metadata_path)
+        cookbook_name = metadata.name
+        name_from_path = File.basename(cookbook_dir)
         unless cookbook_name == name_from_path
           if cookbook_name.empty?
             puts "Cookbook #{name_from_path} has no name specified in metadata.rb"
@@ -112,14 +123,24 @@ module Berktacular
             @missing_deps[name] = "#{name}-#{versions[name]} depends on #{dep_name} which was not installed!"
             warn @missing_deps[name]
             errors = true
-          elsif !Solve::Constraint.new(constraint).satisfies?(actual_version)
-            @missing_deps[name] = "#{name}-#{versions[name]} depends on #{dep_name} #{constraint} but #{dep_name} is #{actual_version}!"
-            warn @missing_deps[name]
-            errors = true
+          elsif constraint != []  # some cookbooks have '[]' as a dependency in their json metadata
+            constraint_obj = begin
+              Semverse::Constraint.new(constraint)
+            rescue Semverse::InvalidConstraintFormat => ex
+              warn "Could not parse version constraint '#{constraint}' " +
+                   "for dependency '#{dep_name}' of cookbook '#{name}'"
+              raise ex
+            end
+
+            unless constraint_obj.satisfies?(actual_version)
+              @missing_deps[name] = "#{name}-#{versions[name]} depends on #{dep_name} #{constraint} but #{dep_name} is #{actual_version}!"
+              warn @missing_deps[name]
+              errors = true
+            end
           end
         end
       end
-      !errors  
+      !errors
     end
 
     # @param berks_conf [String] path to the berkshelf config file to use.
@@ -151,7 +172,7 @@ module Berktacular
 
     # @param [IO] where to write the data.
     def print_berksfile( io = STDOUT )
-      io.puts to_s  
+      io.puts to_s
     end
 
     # @return [String] the berksfile as a String object
@@ -162,7 +183,10 @@ module Berktacular
       str << "# This file is auto-generated, changes will be overwritten\n"
       str << "# Modify the .json environment file and regenerate this Berksfile to make changes.\n\n"
 
-      str << "site :opscode\n\n"
+      @opts[:source_list].each do |source_url|
+        str << "source '#{source_url}'\n"
+      end
+      str << "\n"
       cookbooks.each { |l| str << l.to_s << "\n" }
       str
     end
@@ -170,7 +194,7 @@ module Berktacular
     # @return [Array] a list of Cookbook objects for this environment.
     def cookbooks
       @cookbooks ||= @cookbook_versions.sort.map do |book, version|
-        Cookbook.new(book, version, @cookbook_locations[book], @opts ) 
+        Cookbook.new(book, version, @cookbook_locations[book], @opts )
       end
     end
 
@@ -197,5 +221,9 @@ module Berktacular
       @opts[:git_client] ||= Octokit::Client.new(access_token: @opts[:github_token])
     end
 
+    def metadata_from_json(json_str)
+      OpenStruct.new(JSON.parse(json_str))
+    end
+
   end
 end

data/lib/berktacular/cookbook.rb

@@ -1,3 +1,5 @@
+require 'semverse'
+
 module Berktacular
 
   # This class represents a cookbook entry form a Berksfile
@@ -26,7 +28,7 @@ module Berktacular
       @name             = name          || raise( "Missing cookbook name" )
       @version_spec     = version_spec  || raise( "Missing cookbook version" )
       @version_number   = VERSION_RE.match( version_spec )[0]
-      @version_solved   = Solve::Version.new(@version_number)
+      @version_solved   = Semverse::Version.new(@version_number)
       @auto_upgrade     = config && config['auto_upgrade']  || false
       @versions         = config && config['versions']      || {}
       @config           = config ? config.reject{ |k,v| k == 'auto_upgrade' || k == 'versions' } : nil
@@ -69,8 +71,8 @@ module Berktacular
         next unless m
         v = m[0]
         begin
-          t = Solve::Version.new(v)
-        rescue Solve::Errors::InvalidVersionFormat
+          t = Semverse::Version.new(v)
+        rescue Semverse::InvalidVersionFormat
           next
         end
         next unless t > @version_solved
@@ -79,7 +81,7 @@ module Berktacular
     end
 
     private
-    
+
     # @param upgrade [True,False] use updated cookbook version if @auto_update is also true.
     # @param config [Hash] the cookbook_locations hash associated with this cookbook.
     # @return [String] the config line for this cookbook, everything after the cookbook name.
@@ -88,7 +90,7 @@ module Berktacular
       line = []
       if config
         if config.has_key?('github')
-          line << "github: \"#{config['github']}\""
+          line << "git: \"git@github.com:#{config['github']}.git\""
           line << "rel: \"#{config['rel']}\"" if config.has_key?('rel')
           line << 'protocol: :ssh'
         end
@@ -106,7 +108,7 @@ module Berktacular
       end
       line.join(", ").gsub('%{version}', ver)
     end
-    
+
     # return [Array] a list of tags from the github repository of this cookbook.
     def get_tags_from_github
       @git_client.repo(@config['github']).rels[:tags].get.data.map { |obj| obj.name }

data/lib/berktacular/version.rb

@@ -1,4 +1,4 @@
 module Berktacular
   # the gem version.
-  VERSION = '0.1.7'
+  VERSION = IO.read(File.expand_path('../../../VERSION', __FILE__)).strip
 end

metadata

@@ -1,117 +1,133 @@
 --- !ruby/object:Gem::Specification
 name: berktacular
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeff Harvey-Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-04 00:00:00.000000000 Z
+date: 2014-07-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solve
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '0.8'
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.2
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: ridley
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '1.5'
-    - - ! '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.5.3
+        version: '4.0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.8.9
+        version: '0.9'
 - !ruby/object:Gem::Dependency
   name: octokit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: berkshelf
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.0.0
+        version: '3.1'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.8'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.3'
 description: Generates a Berksfile from JSON style Chef environment files.  Also support
   extension to environment file with 'cookbook_locations'. Verifies the Berksfile
   is consistent (all dependencies met) and will upload updated cookbooks and env files
@@ -126,8 +142,9 @@ files:
 - bin/berktacular
 - lib/berktacular.rb
 - lib/berktacular/berksfile.rb
-- lib/berktacular/cookbook.rb
 - lib/berktacular/version.rb
+- lib/berktacular/cookbook.rb
+- VERSION
 homepage: https://rubygems.org/gems/berktacular
 licenses:
 - Apache License, Version 2.0
@@ -138,17 +155,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '1.9'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.0.14
 signing_key: 
 specification_version: 4
 summary: Parse chef env files, generates a Berksfile and verifies it.