stove 2.0.0 → 3.0.0

data/lib/stove/cli.rb

@@ -15,6 +15,29 @@ module Stove
       # Parse the options hash
       option_parser.parse!(@argv)
 
+      # Stupid special use cases
+      if @argv.first == 'login'
+        if options[:username].nil? || options[:username].to_s.strip.empty?
+          raise "Missing argument `--username'!"
+        end
+
+        if options[:key].nil? || options[:key].to_s.strip.empty?
+          raise "Missing argument `--key'!"
+        end
+
+        Config.username = options[:username]
+        Config.key      = options[:key]
+        Config.save
+
+        @stdout.puts "Successfully saved config to `#{Config.__path__}'!"
+        return
+      end
+
+      # Override configs
+      Config.endpoint = options[:endpoint] if options[:endpoint]
+      Config.username = options[:username] if options[:username]
+      Config.key      = options[:key]      if options[:key]
+
       # Set the log level
       Stove.log_level = options[:log_level]
 
@@ -26,12 +49,6 @@ module Stove
       log.info("Options: #{options.inspect}")
       log.info("ARGV: #{@argv.inspect}")
 
-      # Unless the user specified --no-bump, version is a required argument, so
-      # blow up if we don't get it or if it's not a nice version string
-      if options[:bump]
-        raise OptionParser::MissingArgument.new(:version) unless options[:version]
-      end
-
       # Make a new cookbook object - this will raise an exception if there is
       # no cookbook at the given path
       cookbook = Cookbook.new(options[:path])
@@ -42,7 +59,8 @@ module Stove
       end
 
       # Now execute the actual runners (validations and errors might occur)
-      Runner.run(cookbook, options)
+      runner = Runner.new(cookbook, options)
+      runner.run
 
       # If we got this far, everything was successful :)
       @kernel.exit(0)
@@ -66,55 +84,60 @@ module Stove
     #
     def option_parser
       @option_parser ||= OptionParser.new do |opts|
-        opts.banner = 'Usage: bake x.y.z'
+        opts.banner = 'Usage: stove [OPTIONS]'
 
         opts.separator ''
-        opts.separator 'Actions:'
+        opts.separator 'Plugins:'
 
-        actions = Action.constants.map(&Action.method(:const_get))
-        actions.select(&:id).each do |action|
-          opts.on("--[no-]#{action.id}", action.description) do |v|
-            options[action.id.to_sym] = v
-          end
+        opts.on('--no-git', 'Do not use the git plugin') do
+          options[:no_git] = true
         end
 
         opts.separator ''
-        opts.separator 'Plugins:'
+        opts.separator 'Upload Options:'
 
-        plugins = Plugin.constants.map(&Plugin.method(:const_get))
-        plugins.select(&:id).each do |plugin|
-          opts.on("--[no-]#{plugin.id}", plugin.description) do |v|
-            options[plugin.id.to_sym] = v
-          end
+        opts.on('--endpoint [URL]', 'Upload URL endpoint') do |v|
+          options[:endpoint] = v
         end
 
-        opts.separator ''
-        opts.separator 'Global Options:'
-
-        opts.on('--locale [LANGUAGE]', 'Change the language to output messages') do |locale|
-          I18n.locale = locale
+        opts.on('--username [USERNAME]', 'Username to authenticate with') do |v|
+          options[:username] = v
         end
 
-        opts.on('--log-level [LEVEL]', 'Set the log verbosity') do |v|
-          options[:log_level] = v
+        opts.on('--key [PATH]', 'Path to the private key on disk') do |v|
+          options[:key] = v
         end
 
-        opts.on('--category [CATEGORY]', 'Set category for the cookbook') do |v|
+        opts.on('--category [CATEGORY]', 'Category for the cookbook') do |v|
           options[:category] = v
         end
 
-        opts.on('--path [PATH]', 'Change the path to a cookbook') do |v|
-          options[:path] = v
-        end
+        opts.separator ''
+        opts.separator 'Git Options:'
 
-        opts.on('--remote [REMOTE]', 'The name of the git remote to push to') do |v|
+        opts.on('--remote [REMOTE]', 'Name of the git remote') do |v|
           options[:remote] = v
         end
 
-        opts.on('--branch [BRANCH]', 'The name of the git branch to push to') do |v|
+        opts.on('--branch [BRANCH]', 'Name of the git branch') do |v|
           options[:branch] = v
         end
 
+        opts.on('--sign', 'Sign git tags') do
+          options[:sign] = true
+        end
+
+        opts.separator ''
+        opts.separator 'Global Options:'
+
+        opts.on('--log-level [LEVEL]', 'Set the log verbosity') do |v|
+          options[:log_level] = v
+        end
+
+        opts.on('--path [PATH]', 'Change the path to a cookbook') do |v|
+          options[:path] = v
+        end
+
         opts.on_tail('-h', '--help', 'Show this message') do
           puts opts
           exit
@@ -132,26 +155,22 @@ module Stove
     #
     # @return [Hash]
     def options
-      @options ||= Hash.new(default_value).tap do |h|
-        h[:path]      = Dir.pwd
-        h[:log_level] = :warn
-
-        # Default actions/plugins
-        h[:jira]      = false
-        h[:start]     = true
-        h[:finish]    = true
-
-        h[:remote]    = 'origin'
-        h[:branch]    = 'master'
-      end
-    end
-
-    def default_value
-      @default_value ||= if ENV['CLI_DEFAULT']
-        !!(ENV['CLI_DEFAULT'] =~ /^(true|t|yes|y|1)$/i)
-      else
-        true
-      end
+      @options ||= {
+        # Upload options
+        :endpoint => nil,
+        :username => Config.username,
+        :key      => Config.key,
+        :category => nil,
+
+        # Git options
+        :remote => 'origin',
+        :branch => 'master',
+        :sign   => false,
+
+        # Global options
+        :log_level => :warn,
+        :path      => Dir.pwd,
+      }
     end
   end
 end

data/lib/stove/community.rb

@@ -1,14 +1,16 @@
-require 'faraday'
-require 'faraday_middleware'
+require 'chef-api'
 
 module Stove
   class Community
     include Mixin::Instanceable
     include Mixin::Optionable
-    include Logify
 
-    option :base_url,
-      ENV['COMMUNITY_URL'] || 'https://cookbooks.opscode.com/api/v1'
+    #
+    # The default endpoint where the community site lives.
+    #
+    # @return [String]
+    #
+    DEFAULT_ENDPOINT = 'https://supermarket.getchef.com/api/v1'
 
     #
     # Get and cache a community cookbook's JSON response from the given name
@@ -36,9 +38,9 @@ module Stove
     #
     def cookbook(name, version = nil)
       if version.nil?
-        connection.get("cookbooks/#{name}").body
+        connection.get("cookbooks/#{name}")
       else
-        connection.get("cookbooks/#{name}/versions/#{Util.version_for_url(version)}").body
+        connection.get("cookbooks/#{name}/versions/#{Util.version_for_url(version)}")
       end
     end
 
@@ -50,75 +52,22 @@ module Stove
     #
     def upload(cookbook)
       connection.post('cookbooks', {
-        tarball:  Faraday::UploadIO.new(cookbook.tarball, 'application/x-tar'),
-        cookbook: { category: cookbook.category }.to_json,
+        'tarball'  => File.open(cookbook.tarball, 'rb'),
+        'cookbook' => { 'category' => cookbook.category }.to_json,
       })
     end
 
     private
 
     #
-    # The Faraday connection object with lots of pretty middleware.
+    # The ChefAPI connection object with lots of pretty middleware.
     #
     def connection
-      @connection ||= Faraday.new(base_url) do |builder|
-        # Enable multi-part requests (for uploading)
-        builder.request :multipart
-        builder.request :url_encoded
-
-        # Encode request bodies as JSON
-        builder.request :json
-
-        # Add Mixlib authentication headers
-        builder.use Stove::Middleware::ChefAuthentication, client, key
-
-        # Handle any common errors
-        builder.use Stove::Middleware::Exceptions
-
-        # Decode responses as JSON if the Content-Type is json
-        builder.response :json
-        builder.response :json_fix
-
-        # Allow up to 3 redirects
-        builder.response :follow_redirects, limit: 3
-
-        # Log all requests and responses (useful for development)
-        builder.response :logger, log
-
-        # Raise errors on 40x and 50x responses
-        builder.response :raise_error
-
-        # Use the default adapter (Net::HTTP)
-        builder.adapter :net_http
-
-        # Set the User-Agent header for logging purposes
-        builder.headers[:user_agent] = Stove::USER_AGENT
-
-        # Set some options, such as timeouts
-        builder.options[:timeout]      = 30
-        builder.options[:open_timeout] = 30
+      @connection ||= ChefAPI::Connection.new do |conn|
+        conn.endpoint = ENV['STOVE_ENDPOINT'] || Config.endpoint || DEFAULT_ENDPOINT
+        conn.client   = ENV['STOVE_USERNAME'] || Config.username
+        conn.key      = ENV['STOVE_KEY']      || Config.key
       end
     end
-
-    #
-    # The name of the client to use (by default, this is the username).
-    #
-    # @return [String]
-    #
-    def client
-      Config[:community][:username]
-    end
-
-    #
-    # The path to the key on disk for authentication with the community site.
-    # If a relative path is given, it is expanded relative to the configuration
-    # file on disk.
-    #
-    # @return [String]
-    #   the path to the key on disk
-    #
-    def key
-      File.expand_path(Config[:community][:key], Config.__path__)
-    end
   end
 end

data/lib/stove/config.rb

@@ -1,67 +1,76 @@
+require 'fileutils'
 require 'json'
 
 module Stove
   class Config
-    include Mixin::Instanceable
     include Logify
+    include Mixin::Instanceable
+
+    def method_missing(m, *args, &block)
+      if m.to_s.end_with?('=')
+        __set__(m.to_s.chomp('='), args.first)
+      else
+        __get__(m)
+      end
+    end
 
-    #
-    # Create a new configuration object. If a configuration file does not
-    # exist, this method will output a warning to the UI and use an empty
-    # hash as the data structure.
-    #
-    def initialize
-      log.debug("Reading from config at `#{__path__}'")
+    def respond_to_missing?(m, include_private = false)
+      __has__?(m) || super
+    end
 
-      contents = File.read(__path__)
-      data = JSON.parse(contents, symbolize_names: true)
+    def save
+      FileUtils.mkdir_p(File.dirname(__path__))
+      File.open(__path__, 'w') do |f|
+        f.write(JSON.fast_generate(__raw__))
+      end
+    end
 
-      log.debug("Config:\n#{JSON.pretty_generate(sanitize(data))}")
+    def to_s
+      "#<#{self.class.name} #{__raw__.to_s}>"
+    end
 
-      @data = data
-    rescue Errno::ENOENT
-      log.warn(<<-EOH.gsub(/^ {8}/, ''))
-        No Stove configuration file found at `#{__path__}'. Stove will assume an
-        empty configuration, which may cause problems with some plugins. It is
-        recommended that you create a Stove configuration file as documented:
+    def inspect
+      "#<#{self.class.name} #{__raw__.inspect}>"
+    end
 
-            https://github.com/sethvargo/stove#installation
-      EOH
+    def __get__(key)
+      __raw__[key.to_sym]
+    end
 
-      @data = {}
+    def __has__?(key)
+      __raw__.key?(key.to_sym)
+    end
+
+    def __set__(key, value)
+      __raw__[key.to_sym] = value
+    end
+
+    def __unset__(key)
+      __raw__.delete(key.to_sym)
     end
 
-    #
-    # This is a special key that tells me where stove lives. If you actually
-    # have a key in your config called +__path__+, then it sucks to be you.
-    #
-    # @return [String]
-    #
     def __path__
       @path ||= File.expand_path(ENV['STOVE_CONFIG'] || '~/.stove')
     end
 
-    #
-    # Deletegate all method calls to the underlyng hash.
-    #
-    def method_missing(m, *args, &block)
-      @data.send(m, *args, &block)
-    end
+    def __raw__
+      return @__raw__ if @__raw__
+
+      @__raw__ = JSON.parse(File.read(__path__), symbolize_names: true)
+
+      if @__raw__.key?(:community)
+        $stderr.puts "Detected old Stove configuration file, converting..."
+
+        @__raw__ = {
+          :username => @__raw__[:community][:username],
+          :key      => @__raw__[:community][:key],
+        }
+      end
 
-    private
-
-    def sanitize(data)
-      Hash[*data.map do |key, value|
-        if value.is_a?(Hash)
-          [key, sanitize(value)]
-        else
-          if key =~ /access|token|password/
-            [key, '[FILTERED]']
-          else
-            [key, value]
-          end
-        end
-      end.flatten(1)]
+      @__raw__
+    rescue Errno::ENOENT => e
+      log.warn { "No config file found at `#{__path__}'!" }
+      @__raw__ = {}
     end
   end
 end

data/lib/stove/cookbook/metadata.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'solve'
 
 module Stove
   class Cookbook
@@ -41,7 +40,7 @@ module Stove
           class_eval <<-EOM, __FILE__, __LINE__ + 1
             def #{field}(thing, *args)
               version = args.first
-              @#{instance_variable}[thing] = Solve::Constraint.new(version).to_s
+              @#{instance_variable}[thing] = version.to_s
               @#{instance_variable}[thing]
             end
           EOM
@@ -146,10 +145,9 @@ module Stove
 
       def version(arg = UNSET_VALUE)
         if arg == UNSET_VALUE
-          @version.to_s
+          @version
         else
-          @version = Solve::Version.new(arg)
-          @version.to_s
+          @version = arg.to_s
         end
       end
 

data/lib/stove/cookbook.rb

@@ -72,20 +72,11 @@ module Stove
     #
     def category
       @category ||= Community.cookbook(name)['category']
-    rescue Faraday::Error::ResourceNotFound
+    rescue ChefAPI::Error::HTTPError
       log.warn("Cookbook `#{name}' not found on the Chef community site")
       nil
     end
 
-    #
-    # The URL for the cookbook on the Community Site.
-    #
-    # @return [String]
-    #
-    def url
-      URI.join(Community.base_url, 'cookbooks', name)
-    end
-
     #
     # The tag version. This is just the current version prefixed with the
     # letter "v".
@@ -113,18 +104,10 @@ module Stove
     def released?
       Community.cookbook(name, version)
       true
-    rescue Faraday::Error::ResourceNotFound
+    rescue ChefAPI::Error::HTTPNotFound
       false
     end
 
-    #
-    def release!
-      if options[:changelog]
-        log.info('Updating changelog')
-        update_changelog
-      end
-    end
-
     #
     # So there's this really really crazy bug that the tmp directory could
     # be deleted mid-request...
@@ -140,28 +123,6 @@ module Stove
       @tarball
     end
 
-    #
-    # Bump the version in the metdata.rb to the specified
-    # parameter.
-    #
-    # @param [String] new_version
-    #   the version to bump to
-    #
-    # @return [String]
-    #   the new version string
-    #
-    def bump(new_version)
-      return true if new_version.to_s == version.to_s
-
-      metadata_path = path.join('metadata.rb')
-      contents      = File.read(metadata_path)
-
-      contents.sub!(/^version(\s+)('|")#{version}('|")/, "version\\1\\2#{new_version}\\3")
-
-      File.open(metadata_path, 'w') { |f| f.write(contents) }
-      reload_metadata!
-    end
-
     private
       # Load the metadata and set the @metadata instance variable.
       #

data/lib/stove/error.rb

@@ -1,24 +1,53 @@
+require 'erb'
+
 module Stove
   module Error
+    class ErrorBinding
+      def initialize(options = {})
+        options.each do |key, value|
+          instance_variable_set(:"@#{key}", value)
+        end
+      end
+
+      def get_binding
+        binding
+      end
+    end
+
     class StoveError < StandardError
       def initialize(options = {})
-        return super(options[:_message]) if options[:_message]
+        @options  = options
+        @filename = options.delete(:_template)
 
-        class_name = self.class.to_s.split('::').last
-        error_key  = Util.underscore(class_name)
+        super()
+      end
 
-        super I18n.t("stove.errors.#{error_key}", options)
+      def message
+        erb = ERB.new(File.read(template))
+        erb.result(ErrorBinding.new(@options).get_binding)
       end
-    end
+      alias_method :to_s, :message
 
-    class ValidationFailed < StoveError
-      def initialize(klass, id, options = {})
-        super _message: I18n.t("stove.validations.#{klass}.#{id}", options)
+      private
+
+      def template
+        class_name = self.class.to_s.split('::').last
+        filename   = @filename || Util.underscore(class_name)
+        Stove.root.join('templates', 'errors', "#{filename}.erb")
       end
     end
 
     class GitFailed < StoveError; end
     class MetadataNotFound < StoveError; end
     class ServerUnavailable < StoveError; end
+
+    # Validations
+    class ValidationFailed < StoveError; end
+    class CommunityCategoryValidationFailed < ValidationFailed; end
+    class CommunityKeyValidationFailed < ValidationFailed; end
+    class CommunityUsernameValidationFailed < ValidationFailed; end
+    class GitCleanValidationFailed < ValidationFailed; end
+    class GitRepositoryValidationFailed < ValidationFailed; end
+    class GitUpToDateValidationFailed < ValidationFailed; end
   end
 end

data/lib/stove/filter.rb

@@ -1,8 +1,9 @@
 module Stove
   class Filter
-    include Mixin::Insideable
     include Logify
 
+    include Mixin::Insideable
+
     #
     # The class that created this filter.
     #

data/lib/stove/mixins/instanceable.rb

@@ -4,17 +4,18 @@ module Stove
   module Mixin::Instanceable
     def self.included(base)
       base.send(:include, Singleton)
-      base.send(:undef_method, :inspect, :to_s)
       base.send(:extend, ClassMethods)
     end
 
     def self.extended(base)
       base.send(:include, Singleton)
-      base.send(:undef_method, :inspect, :to_s)
       base.send(:extend, ClassMethods)
     end
 
     module ClassMethods
+      def to_s; instance.to_s; end
+      def inspect; instance.inspect; end
+
       def method_missing(m, *args, &block)
         instance.send(m, *args, &block)
       end

data/lib/stove/mixins/validatable.rb

@@ -1,7 +1,11 @@
 module Stove
   module Mixin::Validatable
     def validate(id, &block)
-      Runner.validations << Validator.new(self, id, &block)
+      validations[id] = Validator.new(self, id, &block)
+    end
+
+    def validations
+      @validations ||= {}
     end
   end
 end

data/lib/stove/packager.rb

@@ -18,7 +18,14 @@ module Stove
       'recipes',
       'resources',
       'templates',
-    ]
+    ].freeze
+
+    ACCEPTABLE_FILES_LIST = ACCEPTABLE_FILES.join(',').freeze
+
+    TMP_FILES = [
+      /^(?:.*[\\\/])?\.[^\\\/]+\.sw[p-z]$/,
+      /~$/,
+    ].freeze
 
     # The cookbook to package.
     #
@@ -38,7 +45,8 @@ module Stove
     # @return [Array]
     #   the array of file paths
     def cookbook_files
-      Dir.glob("#{File.expand_path(cookbook.path)}/{#{ACCEPTABLE_FILES.join(',')}}")
+      path = File.expand_path("#{cookbook.path}/{#{ACCEPTABLE_FILES_LIST}}")
+      Dir[path].reject { |f| TMP_FILES.any? { |regex| f.match(regex) } }
     end
 
     # The path to the tar.gz package in the temporary directory.
@@ -51,7 +59,7 @@ module Stove
     private
 
     def pack!
-      destination = Tempfile.new(cookbook.name).path
+      destination = Tempfile.new([cookbook.name, '.tar.gz']).path
 
       # Sandbox
       sandbox = Dir.mktmpdir