berkshelf-api 1.2.0.rc1 → 1.2.0.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 34d85c7aab58658330e2d602a0e14b90f5fae361
-  data.tar.gz: 086aaca8e72f22a5929b0c387f7bcd764649f4f5
+  metadata.gz: 35fe7a7e1966af33f082d0c1ae1e1732e5891aab
+  data.tar.gz: 6404341b2e51593475c2cf156d9923986aa7f090
 SHA512:
-  metadata.gz: b33d96269b99e1b66364a04c1f3b552c08060b04468a9936386acc169ffc4dd855668e810549c9426154739a9c9a85fa0c4e805ecad7d18def382d2e79ab35d2
-  data.tar.gz: 7b4a98ea88197847dd83f710e558df8446d2c11fe01954517faf8051ac311891627452a84174467b297370a69248f9eb2bfafef741997712a2437d902824b03a
+  metadata.gz: 046e40ccf541a7c7c1f425bfd4aa09af5341d812e2540e18a50079c562a0c1840f4968756ac9f6dcaa6baa735dc2574f9734398eac4d71d923d44f5bbd547c26
+  data.tar.gz: b0779aaa43078a5231f780231a40cf312f274bd390c0857a3429ff121cbf48813a78c8f3cf3ccc6e482dfe82eed058f9dcc0b51660afc8421f1cf6354cb3ee25

data/CHANGELOG.md

@@ -1,10 +1,10 @@
-# master
+# 1.2.0
 
 * Enhancements
-  *
+  * Loosen constraints and bump versions of various gems
 
 * Bug Fixes
-  *
+  * Fix issue with default configuration where home path was not being set
 
 # 1.1.1
 

data/Gemfile

@@ -4,14 +4,13 @@ gemspec
 
 group :development do
   gem 'coolline'
-  gem 'fuubar'
+  gem 'fuubar', '~> 1.1'
   gem 'redcarpet', platforms: :ruby
   gem 'yard'
 
-  gem 'guard'
+  gem 'guard', '~> 1.8'
   gem 'guard-rspec'
   gem 'guard-spork', platforms: :ruby
-  gem 'guard-yard'
 
   require 'rbconfig'
 
@@ -34,6 +33,6 @@ end
 
 group :development, :test do
   gem 'rack-test'
-  gem 'rspec'
-  gem 'spork'
+  gem 'rspec', '~> 2.13'
+  gem 'spork', '~> 0.9'
 end

data/Guardfile

@@ -6,12 +6,6 @@ guard 'spork' do
   watch(%r{^spec/support/.+\.rb$}) { :rspec }
 end
 
-guard 'yard', stdout: '/dev/null', stderr: '/dev/null' do
-  watch(%r{app/.+\.rb})
-  watch(%r{lib/.+\.rb})
-  watch(%r{ext/.+\.c})
-end
-
 guard 'rspec', cli: "--color --drb --format Fuubar", all_on_start: false, all_after_pass: false do
   watch(%r{^spec/unit/.+_spec\.rb$})
 

data/Thorfile

@@ -1,39 +1,94 @@
 # encoding: utf-8
 $:.push File.expand_path("../lib", __FILE__)
+$:.push File.expand_path("../tasks", __FILE__)
 
 require 'bundler'
 require 'bundler/setup'
 require 'thor'
 require 'berkshelf-api'
+require 'build_gem'
+require 'octokit'
 
 class Default < Thor
-  require 'thor/rake_compat'
+  include Thor::Actions
+  namespace "build"
+  default_task :all
 
-  include Thor::RakeCompat
-  Bundler::GemHelper.install_tasks
+  GITHUB_ORG_REGEX = /(git\@github.com\:|https\:\/\/github.com\/)(.+).git/.freeze
+  PKG_DIR          = File.expand_path("../pkg", __FILE__).freeze
+  VENDOR_DIR       = File.expand_path("../vendor", __FILE__).freeze
+  PROJECT_DIR      = File.dirname(__FILE__)
 
-  desc "build", "Build berkshelf-api-#{Berkshelf::API::VERSION}.gem into the pkg directory"
-  def build
-    Rake::Task["build"].execute
+  desc "all", "clean, package, and release to Github"
+  def all
+    clean
+    package
+    release
   end
 
-  desc "install", "Build and install berkshelf-api-#{Berkshelf::API::VERSION}.gem into system gems"
-  def install
-    Rake::Task["install"].execute
+  desc "clean", "clean the packaging directory"
+  def clean
+    say "cleaning..."
+    [ PKG_DIR, VENDOR_DIR ].each do |dir|
+      FileUtils.rm_rf(dir)
+      FileUtils.mkdir_p(dir)
+    end
   end
 
-  desc "release", "Create tag v#{Berkshelf::API::VERSION} and build and push berkshelf-api-#{Berkshelf::API::VERSION}.gem to Rubygems"
-  def release
-    Rake::Task["release"].execute
+  desc "package", "package the software for release"
+  def package
+    say "packaging..."
+    empty_directory PKG_DIR
+    invoke "gem:build"
+    inside(File.dirname(__FILE__)) do
+      run "bundle package --all"
+      files = `git ls-files | grep -v spec`.split("\n")
+      run("tar -czf #{archive_out} #{files.join(' ')} vendor")
+    end
   end
 
-  class Spec < Thor
-    namespace :spec
-    default_task :all
+  method_option :github_token,
+    type: :string,
+    default: ENV["GITHUB_TOKEN"],
+    required: true,
+    aliases: "-t",
+    banner: "TOKEN"
+  desc "release", "release the packaged software to Github"
+  def release
+    say "releasing..."
+    invoke "gem:release"
 
-    desc "all", "run all tests"
-    def all
-      exec "rspec --color --format=documentation spec"
+    begin
+      release = github_client.create_release(repository, version)
+    rescue Octokit::UnprocessableEntity
+      release = github_client.releases(repository).find { |release| release[:tag_name] == version }
     end
+
+    say "Uploading #{File.basename(archive_out)} to Github..."
+    github_client.upload_asset(release[:url], archive_out, name: "berkshelf-api.tar.gz",
+      content_type: "application/x-tar")
   end
+
+  private
+
+    def archive_out
+      File.join(PKG_DIR, "berkshelf-api-#{version}.tar.gz")
+    end
+
+    def github_client
+      @github_client ||= Octokit::Client.new(access_token: options[:github_token])
+    end
+
+    def repository
+      @repository ||= extract_repository
+    end
+
+    def extract_repository
+      _, repository = `git remote show origin | grep Push`.scan(GITHUB_ORG_REGEX).first
+      repository
+    end
+
+    def version
+      @version ||= `git describe`.chomp
+    end
 end

data/berkshelf-api.gemspec

@@ -19,20 +19,22 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_dependency 'ridley', '~> 3.0.0.rc1'
-  spec.add_dependency 'celluloid', '~> 0.15'
-  spec.add_dependency 'reel', '>= 0.4.0'
-  spec.add_dependency 'grape', '~> 0.6'
-  spec.add_dependency 'grape-msgpack', '~> 0.1'
-  spec.add_dependency 'hashie', '>= 2.0.4'
-  spec.add_dependency 'faraday', '~> 0.9.0'
-  spec.add_dependency 'retryable', '~> 1.3.3'
-  spec.add_dependency 'archive', '= 0.0.5'
-  spec.add_dependency 'buff-config', '~> 0.1'
-  spec.add_dependency 'octokit', '~> 2.6'
-  spec.add_dependency 'solve'
+  spec.add_dependency 'ridley',         '~> 3.0'
+  spec.add_dependency 'celluloid',      '~> 0.16.0.pre'
+  spec.add_dependency 'reel',           '>= 0.4.0'
+  spec.add_dependency 'http',           '~> 0.5.0' # explicitly lock because reel's is too lax
+  spec.add_dependency 'grape',          '~> 0.6'
+  spec.add_dependency 'grape-msgpack',  '~> 0.1'
+  spec.add_dependency 'hashie',         '>= 2.0.4'
+  spec.add_dependency 'faraday',        '~> 0.9.0'
+  spec.add_dependency 'retryable',      '~> 1.3.3'
+  spec.add_dependency 'archive',        '= 0.0.6'
+  spec.add_dependency 'buff-config',    '~> 0.1'
+  spec.add_dependency 'octokit',        '~> 2.6'
+  spec.add_dependency 'semverse',       '~> 1.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'thor', '~> 0.18.0'
+  spec.add_development_dependency 'bundler',   '~> 1.3'
+  spec.add_development_dependency 'thor',      '~> 0.18'
   spec.add_development_dependency 'chef-zero', '~> 1.5'
+  spec.add_development_dependency "octokit",   '~> 2.6'
 end

data/lib/berkshelf/api/cache_builder/worker/github.rb

@@ -1,5 +1,5 @@
 require 'octokit'
-require 'solve'
+require 'semverse'
 require 'net/http'
 
 module Berkshelf::API
@@ -46,7 +46,7 @@ module Berkshelf::API
                       log.warn "Version found in metadata for #{repo.name} (#{tag.name}) does not " +
                         "match the tag. Got #{cookbook_metadata.version}."
                     end
-                  rescue Solve::Errors::InvalidVersionFormat
+                  rescue Semverse::InvalidVersionFormat
                     log.debug "Ignoring tag #{tag.name} for: #{repo.name}. Does not conform to semver."
                   rescue Octokit::NotFound
                     log.debug "Ignoring tag #{tag.name} for: #{repo.name}. No raw metadata found."

data/lib/berkshelf/api/version.rb

@@ -1,5 +1,5 @@
 module Berkshelf
   module API
-    VERSION = "1.2.0.rc1"
+    VERSION = "1.2.0.rc2"
   end
 end

data/spec/support/chef_server.rb

@@ -1,73 +1,75 @@
 require 'chef_zero/server'
 
-module Berkshelf::RSpec
-  module ChefServer
-    class << self
-      def clear_request_log
-        @request_log = Array.new
-      end
+module Berkshelf
+  module RSpec
+    module ChefServer
+      class << self
+        def clear_request_log
+          @request_log = Array.new
+        end
 
-      def request_log
-        @request_log ||= Array.new
-      end
+        def request_log
+          @request_log ||= Array.new
+        end
 
-      def server
-        @server ||= ChefZero::Server.new(port: PORT, generate_real_keys: false)
-      end
+        def server
+          @server ||= ChefZero::Server.new(port: PORT, generate_real_keys: false)
+        end
 
-      def server_url
-        (@server && @server.url) || "http://localhost/#{PORT}"
-      end
+        def server_url
+          (@server && @server.url) || "http://localhost/#{PORT}"
+        end
+
+        def start
+          server.start_background
+          server.on_response do |request, response|
+            request_log << [ request, response ]
+          end
+          clear_request_log
 
-      def start
-        server.start_background
-        server.on_response do |request, response|
-          request_log << [ request, response ]
+          server
         end
-        clear_request_log
 
-        server
-      end
+        def stop
+          @server.stop if @server
+        end
 
-      def stop
-        @server.stop if @server
+        def running?
+          @server && @server.running?
+        end
       end
 
-      def running?
-        @server && @server.running?
+      PORT = 8889
+
+      def chef_client(name, hash = Hash.new)
+        load_data(:clients, name, hash)
       end
-    end
 
-    PORT = 8889
+      def chef_cookbook(name, version, cookbook = Hash.new)
+        ChefServer.server.load_data("cookbooks" => { "#{name}-#{version}" => cookbook })
+      end
 
-    def chef_client(name, hash = Hash.new)
-      load_data(:clients, name, hash)
-    end
+      def chef_data_bag(name, hash = Hash.new)
+        ChefServer.server.load_data({ 'data' => { name => hash }})
+      end
 
-    def chef_cookbook(name, version, cookbook = Hash.new)
-      ChefServer.server.load_data("cookbooks" => { "#{name}-#{version}" => cookbook })
-    end
+      def chef_environment(name, hash = Hash.new)
+        load_data(:environments, name, hash)
+      end
 
-    def chef_data_bag(name, hash = Hash.new)
-      ChefServer.server.load_data({ 'data' => { name => hash }})
-    end
+      def chef_node(name, hash = Hash.new)
+        load_data(:nodes, name, hash)
+      end
 
-    def chef_environment(name, hash = Hash.new)
-      load_data(:environments, name, hash)
-    end
+      def chef_role(name, hash = Hash.new)
+        load_data(:roles, name, hash)
+      end
 
-    def chef_node(name, hash = Hash.new)
-      load_data(:nodes, name, hash)
-    end
+      private
 
-    def chef_role(name, hash = Hash.new)
-      load_data(:roles, name, hash)
+        def load_data(key, name, hash)
+          ChefServer.server.load_data(key.to_s => { name => JSON.fast_generate(hash) })
+        end
     end
-
-    private
-
-      def load_data(key, name, hash)
-        ChefServer.server.load_data(key.to_s => { name => JSON.fast_generate(hash) })
-      end
   end
 end

data/tasks/build_gem.rb

@@ -0,0 +1,34 @@
+require 'thor'
+
+class BuildGem < Thor
+  require 'thor/rake_compat'
+  namespace "gem"
+
+  include Thor::RakeCompat
+  Bundler::GemHelper.install_tasks
+
+  desc "build", "Build berkshelf-api-#{Berkshelf::API::VERSION}.gem into the pkg directory"
+  def build
+    Rake::Task["build"].execute
+  end
+
+  desc "install", "Build and install berkshelf-api-#{Berkshelf::API::VERSION}.gem into system gems"
+  def install
+    Rake::Task["install"].execute
+  end
+
+  desc "release", "Create tag v#{Berkshelf::API::VERSION} and build and push berkshelf-api-#{Berkshelf::API::VERSION}.gem to Rubygems"
+  def release
+    Rake::Task["release"].execute
+  end
+
+  class Spec < Thor
+    namespace :spec
+    default_task :all
+
+    desc "all", "run all tests"
+    def all
+      exec "rspec --color --format=documentation spec"
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: berkshelf-api
 version: !ruby/object:Gem::Version
-  version: 1.2.0.rc1
+  version: 1.2.0.rc2
 platform: ruby
 authors:
 - Jamie Winsor
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-03 00:00:00.000000000 Z
+date: 2014-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ridley
@@ -17,28 +17,28 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc1
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: celluloid
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0.pre
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '0.15'
+        version: 0.16.0.pre
 - !ruby/object:Gem::Dependency
   name: reel
   requirement: !ruby/object:Gem::Requirement
@@ -53,6 +53,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: http
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.5.0
 - !ruby/object:Gem::Dependency
   name: grape
   requirement: !ruby/object:Gem::Requirement
@@ -129,14 +143,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.0.5
+        version: 0.0.6
 - !ruby/object:Gem::Dependency
   name: buff-config
   requirement: !ruby/object:Gem::Requirement
@@ -166,19 +180,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: solve
+  name: semverse
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -199,14 +213,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: '0.18'
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
@@ -221,6 +235,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
+  name: octokit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '2.6'
 description: Berkshelf dependency API server
 email:
 - jamie@vialstudios.com
@@ -296,6 +324,7 @@ files:
 - spec/unit/berkshelf/api/rest_gateway_spec.rb
 - spec/unit/berkshelf/api/site_connector/opscode_spec.rb
 - spec/unit/berkshelf/api/srv_ctl_spec.rb
+- tasks/build_gem.rb
 homepage: https://github.com/berkshelf/berkshelf-api
 licenses:
 - Apache 2.0