stove 1.1.2 → 2.0.0.beta.1

data/features/step_definitions/cucumber_steps.rb

@@ -0,0 +1,12 @@
+# These are steps that should really exist in cucumber, but they don't...
+When /^the environment variable "(.+)" is "(.+)"/ do |variable, value|
+  set_env(variable, value)
+end
+
+When /^the environment variable "(.+)" is unset$/ do |variable|
+  set_env(variable, nil)
+end
+
+Then /^it should (pass|fail) with "(.+)"$/ do |pass_fail, partial|
+  self.__send__("assert_#{pass_fail}ing_with", partial)
+end

data/features/step_definitions/git_steps.rb

@@ -1,12 +1,15 @@
 Given /^the remote repository has additional commits/ do
-  Dir.chdir(fake_git_remote) do
-    shellout 'touch myfile.txt'
-    git 'add myfile.txt'
-    git 'commit -m "Add a new file"'
-  end
+  cmd = [
+    'cd "' + fake_git_remote + '"',
+    'touch myfile.txt',
+    'git add --force myfile.txt',
+    'git commit --message "Add new file"',
+  ].join(' && ')
+
+  %x|#{cmd}|
 end
 
-Then /^the git remote will( not)? have the commit "(.+)"$/ do |negate, message|
+Then /^the git remote should( not)? have the commit "(.+)"$/ do |negate, message|
   commits = git_commits(fake_git_remote)
 
   if negate
@@ -16,7 +19,7 @@ Then /^the git remote will( not)? have the commit "(.+)"$/ do |negate, message|
   end
 end
 
-Then /^the git remote will( not)? have the tag "(.+)"$/ do |negate, tag|
+Then /^the git remote should( not)? have the tag "(.+)"$/ do |negate, tag|
   tags = git_tags(fake_git_remote)
 
   if negate

data/features/support/env.rb

@@ -1,40 +1,24 @@
+require 'bundler/setup'
+
 require 'aruba/api'
 require 'aruba/cucumber'
-require 'aruba/in_process'
+require 'cucumber/rspec/doubles'
 require 'rspec/expectations'
+
+require 'community_zero/rspec'
+CommunityZero::RSpec.start
+Before { CommunityZero::RSpec.reset! }
+
 require 'stove'
 
-require_relative '../../spec/support/community_site'
-require_relative '../../spec/support/git'
+require File.expand_path('../stove/git', __FILE__)
 
 World(Aruba::Api)
-World(Stove::RSpec::Git)
-
-Stove.set_formatter(:silent)
-Stove::Config.instance_variable_set(:@instance, {
-  'jira_username'    => 'default',
-  'jira_password'    => 'default',
-  'github_usernmae'  => 'default',
-  'github_password'  => 'default',
-  'opscode_username' => 'stove',
-  'opscode_pem_file' => File.expand_path(File.join(__FILE__, '..', 'stove.pem')),
-})
-Stove::RSpec::CommunitySite.start(port: 3390)
-Stove::CommunitySite.base_uri(Stove::RSpec::CommunitySite.server_url)
-Stove::CommunitySite.http_uri(Stove::RSpec::CommunitySite.server_url)
+World(Stove::Git)
 
 Before do
-  @dirs = [Dir.mktmpdir]
-  Stove::RSpec::CommunitySite.reset!
-end
-
-Before('~@spawn') do
-  Aruba::InProcess.main_class = Stove::Cli
-  Aruba.process = Aruba::InProcess
-end
-
-Before('@spawn') do
-  Aruba.process = Aruba::SpawnProcess
+  FileUtils.rm_rf(tmp_path)
+  @aruba_timeout_seconds = 15
 end
 
 # The path to Aruba's "stuff"

data/features/support/stove/git.rb

@@ -0,0 +1,48 @@
+require 'fileutils'
+
+module Stove
+  module Git
+    def git_init(path = Dir.pwd)
+      cmd = [
+        'cd "' + path + '"',
+        'git init .',
+        'git add --all',
+        'git commit --message "Initial commit"',
+        'git remote add origin file://' + fake_git_remote,
+        'git push --quiet --force origin master',
+      ].join(' && ')
+
+      %x|#{cmd}|
+    end
+
+    def fake_git_remote
+      path = File.expand_path(File.join(tmp_path, 'remote.git'))
+      return path if File.exists?(path)
+
+      FileUtils.mkdir_p(path)
+      cmd = [
+        'cd "' + path + '"',
+        'git init .',
+        'git config receive.denyCurrentBranch ignore',
+        'git config receive.denyNonFastforwards true',
+        'git config core.sharedrepository 1',
+      ].join(' && ')
+
+      %x|#{cmd}|
+
+      path
+    end
+
+    def git_shas(path)
+      %x|cd "#{path}" && git log --oneline|.split("\n").map { |line| line.split(/\s+/, 2).first.strip } rescue []
+    end
+
+    def git_commits(path)
+      %x|cd "#{path}" && git log --oneline|.split("\n").map { |line| line.split(/\s+/, 2).last.strip } rescue []
+    end
+
+    def git_tags(path)
+      %x|cd "#{path}" && git tag --list|.split("\n").map(&:strip) rescue []
+    end
+  end
+end

data/lib/stove.rb

@@ -1,27 +1,110 @@
+require 'pathname'
+
+require 'log4r'
+Log4r.define_levels(*Log4r::Log4rConfig::LogLevels)
+
 module Stove
-  require_relative 'stove/config'
-  require_relative 'stove/git'
-  require_relative 'stove/logger'
-
-  require_relative 'stove/cli'
-  require_relative 'stove/community_site'
-  require_relative 'stove/cookbook'
-  require_relative 'stove/error'
-  require_relative 'stove/formatter'
-  require_relative 'stove/github'
-  require_relative 'stove/jira'
-  require_relative 'stove/mash'
-  require_relative 'stove/packager'
-  require_relative 'stove/uploader'
-  require_relative 'stove/version'
+  autoload :Config,     'stove/config'
+  autoload :Community,  'stove/community'
+  autoload :Cookbook,   'stove/cookbook'
+  autoload :Cli,        'stove/cli'
+  autoload :Error,      'stove/error'
+  autoload :Filter,     'stove/filter'
+  autoload :JIRA,       'stove/jira'
+  autoload :Mash,       'stove/mash'
+  autoload :Packager,   'stove/packager'
+  autoload :Runner,     'stove/runner'
+  autoload :Util,       'stove/util'
+  autoload :Validator,  'stove/validator'
+  autoload :VERSION,    'stove/version'
+
+  module Action
+    autoload :Base,      'stove/actions/base'
+    autoload :Bump,      'stove/actions/bump'
+    autoload :Changelog, 'stove/actions/changelog'
+    autoload :Dev,       'stove/actions/dev'
+    autoload :Finish,    'stove/actions/finish'
+    autoload :Start,     'stove/actions/start'
+    autoload :Upload,    'stove/actions/upload'
+  end
+
+  module Middleware
+    autoload :ChefAuthentication, 'stove/middlewares/chef_authentication'
+    autoload :Exceptions,         'stove/middlewares/exceptions'
+  end
+
+  module Mixin
+    autoload :Filterable,   'stove/mixins/filterable'
+    autoload :Insideable,   'stove/mixins/insideable'
+    autoload :Instanceable, 'stove/mixins/instanceable'
+    autoload :Loggable,     'stove/mixins/loggable'
+    autoload :Optionable,   'stove/mixins/optionable'
+    autoload :Validatable,  'stove/mixins/validatable'
+  end
+
+  module Plugin
+    autoload :Base,   'stove/plugins/base'
+    autoload :Git,    'stove/plugins/git'
+    autoload :GitHub, 'stove/plugins/github'
+    autoload :JIRA,   'stove/plugins/jira'
+  end
+
+  #
+  # A constant to represent an unset value. +nil+ is too generic and doesn't
+  # allow users to specify a value as +nil+. Using this constant, we can
+  # safely create +set_or_return+-style methods.
+  #
+  # @return [Object]
+  #
+  UNSET_VALUE = Object.new
+
+  #
+  # The User-Agent to use for HTTP requests
+  #
+  # @return [String]
+  #
+  USER_AGENT = "Stove #{VERSION}"
 
   class << self
-    def formatter
-      @formatter ||= Stove::Formatter::Human.new
+    #
+    # The source root of the ChefAPI gem. This is useful when requiring files
+    # that are relative to the root of the project.
+    #
+    # @return [Pathname]
+    #
+    def root
+      @root ||= Pathname.new(File.expand_path('../../', __FILE__))
     end
 
-    def set_formatter(name)
-      @formatter = Stove::Formatter::Base.formatters[name.to_sym].new
+    #
+    # The current log level for the entire application.
+    #
+    # @return [Integer]
+    #
+    def log_level
+      Log4r::Logger.global.level
+    end
+
+    #
+    # Set the global log level.
+    #
+    # @example Set the log level to warn
+    #   Stove.log_level = :warn
+    #
+    # @param [String, Symbol] id
+    #   the log level to set
+    #
+    def log_level=(id)
+      level = Log4r.const_get(id.to_s.upcase)
+      raise NameError unless level.is_a?(Integer)
+
+      Log4r::Logger.global.level = level
+    rescue NameError
+      $stderr.puts "ERROR `#{id}' is not a valid Log Level!"
     end
   end
 end
+
+require 'i18n'
+I18n.enforce_available_locales = true
+I18n.load_path << Dir[Stove.root.join('locales', '*.yml').to_s]

data/lib/stove/actions/base.rb

@@ -0,0 +1,21 @@
+module Stove
+  class Action::Base
+    extend Mixin::Loggable
+    extend Mixin::Optionable
+    extend Mixin::Validatable
+
+    option :id
+    option :description
+
+    attr_reader :cookbook
+    attr_reader :options
+
+    def initialize(cookbook, options = {})
+      @cookbook, @options = cookbook, options
+    end
+
+    def run
+      raise Error::AbstractMethod.new(method: 'Action::Base#run')
+    end
+  end
+end

data/lib/stove/actions/bump.rb

@@ -0,0 +1,25 @@
+module Stove
+  class Action::Bump < Action::Base
+    id 'bump'
+    description 'Perform a version bump the local version automatically'
+
+    validate(:changed) do
+      cookbook.version != options[:version]
+    end
+
+    validate(:incremented) do
+      version = Gem::Version.new(options[:version])
+      Gem::Requirement.new("> #{cookbook.version}").satisfied_by?(version)
+    end
+
+    def run
+      log.info('Performing version bump')
+      log.debug("Version is currently #{cookbook.version}")
+      log.debug("Bumped version is #{options[:version]}")
+
+      cookbook.bump(options[:version])
+
+      log.debug("Version is now #{cookbook.version}")
+    end
+  end
+end

data/lib/stove/actions/changelog.rb

@@ -0,0 +1,71 @@
+module Stove
+  class Action::Changelog < Action::Base
+    id 'changelog'
+    description 'Generate and prompt for a CHANGELOG'
+
+    validate(:exists) do
+      File.exists?('CHANGELOG.md')
+    end
+
+    validate(:format) do
+      lines = File.read('CHANGELOG.md')
+      lines.match(/^[\w\s]+\n=+(.*\n)+v[0-9\.]+(\ \(.+\))?\n\-+/)
+    end
+
+    validate(:editor) do
+      !ENV['EDITOR'].nil?
+    end
+
+    def run
+      log.info('Generating new Changelog')
+      log.debug("Generated changeset:\n#{default_changeset}")
+
+      # Open a file prompt for changes
+      prompt_for_changeset
+
+      log.debug("New changeset:\n#{cookbook.changeset}")
+
+      # Write the new changelog to disk
+      path     = File.join(cookbook.path, 'CHANGELOG.md')
+      contents = File.readlines(path)
+      index    = contents.find_index { |line| line =~ /^(--)+/ }
+
+      log.debug("Writing changelog at `#{path}', index #{index}")
+
+      contents.insert(index - 2, "\n" + cookbook.changeset + "\n\n")
+
+      File.open(path, 'w') { |file| file.write(contents.join('')) }
+    end
+
+    def prompt_for_changeset
+      tempfile = Tempfile.new(["#{cookbook.name}-changeset-#{Time.now}", '.md'])
+      tempfile.write(default_changeset)
+      tempfile.rewind
+
+      # Shell out to the default editor
+      system %Q|$EDITOR "#{tempfile.path}"|
+
+      # Save the resulting changes back to the cookbook object
+      cookbook.changeset = File.read(tempfile.path).strip
+
+      # Cleanup
+      tempfile.close
+      tempfile.unlink
+    end
+
+    def default_changeset
+      return @default_changeset if @default_changeset
+
+      header = "v#{cookbook.version} (#{Time.now.to_date})"
+
+      contents = []
+      contents << header
+      contents << '-'*header.length
+      contents << cookbook.changeset || 'Enter CHANGELOG entries here'
+      contents << ''
+
+      @default_changeset = contents.join("\n")
+      @default_changeset
+    end
+  end
+end

data/lib/stove/actions/dev.rb

@@ -0,0 +1,22 @@
+module Stove
+  class Action::Dev < Action::Base
+    id 'dev'
+    description 'Bump a minor version release for development purposes'
+
+    def run
+      log.info('Bumping for development release')
+      log.debug("Version is currently #{cookbook.version}")
+      log.debug("Bumped version is #{dev_version}")
+
+      cookbook.bump(dev_version)
+
+      log.debug("Version is now #{cookbook.version}")
+    end
+
+    def dev_version
+      split = cookbook.version.split('.').map(&:to_i)
+      split[2] += 1
+      split.join('.')
+    end
+  end
+end

data/lib/stove/actions/finish.rb

@@ -0,0 +1,8 @@
+module Stove
+  class Action::Finish < Action::Base
+    def run
+      log.debug('Running cleanup hooks...')
+      log.info('Done!')
+    end
+  end
+end

data/lib/stove/actions/start.rb

@@ -0,0 +1,7 @@
+module Stove
+  class Action::Start < Action::Base
+    def run
+      log.info("Running Stove #{Stove::VERSION} on `#{cookbook.name}'")
+    end
+  end
+end

data/lib/stove/actions/upload.rb

@@ -0,0 +1,27 @@
+module Stove
+  class Action::Upload < Action::Base
+    id 'upload'
+    description 'Upload the cookbook to the community site'
+
+    validate(:configuration) do
+      Config.has_key?(:community)
+    end
+
+    validate(:username) do
+      Config[:community].has_key?(:username)
+    end
+
+    validate(:key) do
+      Config[:community].has_key?(:key)
+    end
+
+    validate(:category) do
+      !cookbook.category.nil?
+    end
+
+    def run
+      log.info('Uploading to the Chef community site')
+      Community.upload(cookbook)
+    end
+  end
+end