busser 0.5.0 → 0.6.0.beta.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56c3602ee860ebf5588118323c225a1422f39266
-  data.tar.gz: 231ce785a23762ebb5df63fd166ac141f8ad4bdf
+  metadata.gz: 9a782f54c494ef115c46f5eb93a425ab68fa0a66
+  data.tar.gz: db0848cdaf0125f4278ca07235a1e17622e029d6
 SHA512:
-  metadata.gz: ecdaa8ecd9ee5da43847c1854bbd89daf83c7827c59868c789516981b673dde52aa348eaf7d91eee4bb4ef56b06b5133d40df83a227bc1de00fe8516df3e183e
-  data.tar.gz: d38795cb52d203f591cbec7e5d9b1805e05eb804871bde50e5829dba84df7913116c716b90efa5eb16dcda686886109a4ad44266ebac35e9407c62f5720f99dc
+  metadata.gz: 1c5dc8dab0ae8e6c2a9308b0672840ff2a7b3f02ea48c34c6c16163ca33b79810cc5e882251158d97fa26f44f4ef5c6107baf5f16da8c150b378b7414cb770bf
+  data.tar.gz: 8ea4c37df7a079eba2c40466702c7ac1314255ba83e3be2c0964b59617d4c0bc6c50e5447b037b65d8631857a2094ab7443182d8d2f961fce1d5975dc3435783

data/lib/busser/command/test.rb

@@ -68,8 +68,9 @@ module Busser
         prepare_recipe = suite_path(runner).join("prepare_recipe.rb")
 
         if prepare_recipe.exist?
-          banner "Preparing #{runner} suite with #{prepare_recipe}"
-          chef_apply(:file => prepare_recipe)
+          warn "Apologies, but Busser no longer supports the" +
+            " prepare_recipe.rb file. Please use prepare.sh and optionally" +
+            " shell out to chef-apply in an Omnibus installtion."
         end
       end
     end

data/lib/busser/helpers.rb

@@ -47,8 +47,10 @@ module Busser
     end
 
     def chef_apply(config = {}, &block)
-      require 'busser/chef_apply'
-      ChefApply.new(config, &block).converge
+      warn "Apologies, but Busser no longer supports the chef_apply helper," +
+        " so the contents of this block will not be exectued. Please refactor" +
+        " your code to use Thor actions, shell out commands or another" +
+        " strategy"
     end
 
     def install_gem(gem, version = nil)

data/lib/busser/runner_plugin/dummy.rb

@@ -29,17 +29,9 @@ class Busser::RunnerPlugin::Dummy < Busser::RunnerPlugin::Base
   # use.
   #
   postinstall do
-    # ensure that dummy_path gets pulled into the chef_apply block closure,
-    # otherwise the Chef will not understand dummy_path in its run context
     dummy_path = suite_path("dummy").to_s
 
-    # expensive operation delegating a directory creation to Chef, but imagine
-    # using resources such as package, remote_file, etc.
-    chef_apply do
-      directory(dummy_path) { recursive true }
-    end
-
-    # create a dummy file
+    empty_directory(dummy_path)
     create_file("#{dummy_path}/foobar.txt", "The Dummy Driver.")
   end
 

data/lib/busser/version.rb

@@ -17,5 +17,5 @@
 # limitations under the License.
 
 module Busser
-  VERSION = "0.5.0"
+  VERSION = "0.6.0.beta.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: busser
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0.beta.1
 platform: ruby
 authors:
 - Fletcher Nichol
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-20 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -208,8 +208,6 @@ files:
 - features/suite_path_command.feature
 - features/support/env.rb
 - lib/busser.rb
-- lib/busser/chef_apply.rb
-- lib/busser/chef_ext.rb
 - lib/busser/cli.rb
 - lib/busser/command/deserialize.rb
 - lib/busser/command/plugin.rb
@@ -266,9 +264,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 1.9.1
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.0.3

data/lib/busser/chef_apply.rb

@@ -1,108 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2013, Fletcher Nichol
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'busser/chef_ext'
-
-module Busser
-
-  # A modified re-implementation of chef-apply which ships with Chef 11 gems.
-  #
-  # @author Fletcher Nichol <fnichol@nichol.ca>
-  #
-  class ChefApply
-
-    def initialize(config = {}, &block)
-      @config = { :why_run => false }.merge(config)
-      @apply_block = block
-
-      if ! config.has_key?(:file) && ! block_given?
-        raise ArgumentError, ":file or block must be given"
-      end
-    end
-
-    def converge
-      as_solo do
-        load_recipe
-        Chef::Runner.new(run_context).converge
-      end
-    end
-
-    private
-
-    attr_reader :config, :apply_block
-
-    COOKBOOK_NAME   = "(chef-apply cookbook)".freeze
-    COOKBOOK_RECIPE = "(chef-apply recipe)".freeze
-
-    def as_solo
-      log_level = Chef::Log.level
-      solo_mode = Chef::Config[:solo]
-      why_run   = Chef::Config[:why_run]
-
-      Chef::Log.level         = chef_log_level
-      Chef::Config[:solo]     = true
-      Chef::Config[:why_run]  = config[:why_run]
-      yield
-    ensure
-      Chef::Config[:why_run]  = why_run
-      Chef::Config[:solo]     = solo_mode
-      Chef::Log.level         = log_level
-    end
-
-    def load_recipe
-      recipe = Chef::Recipe.new(COOKBOOK_NAME, COOKBOOK_RECIPE, run_context)
-
-      if config[:file]
-        recipe.from_file(config[:file].to_s)
-      else
-        recipe.instance_eval(&apply_block)
-      end
-    end
-
-    def run_context
-      @run_context ||= begin
-        if client.events.nil?
-          Chef::RunContext.new(client.node, cookbook_collection)
-        else
-          Chef::RunContext.new(client.node, cookbook_collection, client.events)
-        end
-      end
-    end
-
-    def cookbook_collection
-      @cookbook_collection ||= begin
-        cookbook = Chef::CookbookVersion.new(COOKBOOK_NAME)
-        Chef::CookbookCollection.new({ COOKBOOK_NAME => cookbook })
-      end
-    end
-
-    def client
-      @client ||= begin
-        client = Chef::Client.new
-        client.run_ohai
-        client.load_node
-        client.build_node
-        client
-      end
-    end
-
-    def chef_log_level
-      (ENV['BUSSER_LOG_LEVEL'] && ENV['BUSSER_LOG_LEVEL'].to_sym) || :info
-    end
-  end
-end

data/lib/busser/chef_ext.rb

@@ -1,52 +0,0 @@
-# -*- encoding: utf-8 -*-
-#
-# Author:: Fletcher Nichol (<fnichol@nichol.ca>)
-#
-# Copyright (C) 2013, Fletcher Nichol
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-require 'chef/client'
-require 'chef/providers'
-require 'chef/resources'
-require 'chef/cookbook_version'
-
-# Monkey patches to Chef core classes to allow for chef-apply functionality.
-class Chef
-
-  # Backwards compatible shim for older Chef clients.
-  class Client
-    attr_reader :events
-  end
-
-  # Chef::CookbookVersion, monkey patched to use simpler file source
-  # paths (always uses local files instead of manifest records).
-  #
-  # Implementation from the sandwich project at:
-  # https://github.com/sometimesfood/sandwich
-  #
-  class CookbookVersion
-    # Determines the absolute source filename on disk for various file
-    # resources from their relative path
-    #
-    # @param [Chef::Node] node the node object, ignored
-    # @param [Symbol] segment the segment of the current resource, ignored
-    # @param [String] source the source file path
-    # @param [String] target the target file path, ignored
-    # @return [String] the preferred source filename
-    def preferred_filename_on_disk_location(node, segment, source, target = nil)
-      # keep absolute paths, convert relative paths into absolute paths
-      source.start_with?('/') ? source : File.join(Dir.getwd, source)
-    end
-  end
-end