ridley 0.9.1 → 0.10.0.rc1

data/spec/unit/ridley/sandbox_uploader_spec.rb

@@ -1,13 +1,11 @@
 require 'spec_helper'
 
 describe Ridley::SandboxUploader do
-  let(:connection) { double('chef-conn') }
   let(:client) do
     double('client',
       client_name: 'reset',
       client_key: fixtures_path.join('reset.pem'),
-      options: {},
-      connection: connection
+      options: {}
     )
   end
 
@@ -68,10 +66,6 @@ describe Ridley::SandboxUploader do
     let(:chk_id) { "oGCPHrQ+5MylEL+V+NIJ9w==" }
     let(:path) { fixtures_path.join('reset.pem').to_s }
 
-    before do
-      connection.stub(foss?: false)
-    end
-
     context "when the checksum needs uploading" do
       let(:checksums) do
         {
@@ -106,26 +100,5 @@ describe Ridley::SandboxUploader do
         subject.upload(chk_id, path).should be_nil
       end
     end
-
-    context "when the connection is an open source server connection with a non-80 port" do
-      before do
-        connection.stub(foss?: true, server_url: "http://localhost:8889")
-      end
-
-      let(:checksums) do
-        {
-          chk_id => {
-            url: "http://localhost/sandboxes/bd091b150b0a4578b97771af6abf3e05",
-            needs_upload: true
-          }
-        }
-      end
-
-      it "does not strip the port from the target to upload to" do
-        stub_request(:put, "http://localhost:8889/sandboxes/bd091b150b0a4578b97771af6abf3e05")
-
-        subject.upload(chk_id, path)
-      end
-    end
   end
 end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: ridley
 version: !ruby/object:Gem::Version
-  version: 0.9.1
-  prerelease: 
+  version: 0.10.0.rc1
+  prerelease: 7
 platform: ruby
 authors:
 - Jamie Winsor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-28 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -267,6 +267,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: winrm
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: A reliable Chef API client with a clean syntax
 email:
 - reset@riotgames.com
@@ -275,20 +291,23 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .rbenv-version
+- .ruby-version
 - .travis.yml
 - Gemfile
 - Guardfile
 - LICENSE
 - README.md
 - Thorfile
-- bootstrappers/omnibus.erb
+- bootstrappers/unix_omnibus.erb
+- bootstrappers/windows_omnibus.erb
 - lib/ridley.rb
+- lib/ridley/bootstrap_bindings.rb
+- lib/ridley/bootstrap_bindings/unix_template_binding.rb
+- lib/ridley/bootstrap_bindings/windows_template_binding.rb
 - lib/ridley/bootstrapper.rb
 - lib/ridley/bootstrapper/context.rb
 - lib/ridley/chain_link.rb
 - lib/ridley/chef.rb
-- lib/ridley/chef/chefignore.rb
 - lib/ridley/chef/cookbook.rb
 - lib/ridley/chef/cookbook/metadata.rb
 - lib/ridley/chef/cookbook/syntax_check.rb
@@ -296,6 +315,13 @@ files:
 - lib/ridley/client.rb
 - lib/ridley/connection.rb
 - lib/ridley/errors.rb
+- lib/ridley/host_connector.rb
+- lib/ridley/host_connector/response.rb
+- lib/ridley/host_connector/response_set.rb
+- lib/ridley/host_connector/ssh.rb
+- lib/ridley/host_connector/ssh/worker.rb
+- lib/ridley/host_connector/winrm.rb
+- lib/ridley/host_connector/winrm/worker.rb
 - lib/ridley/log.rb
 - lib/ridley/logging.rb
 - lib/ridley/middleware.rb
@@ -305,6 +331,7 @@ files:
 - lib/ridley/middleware/parse_json.rb
 - lib/ridley/middleware/retry.rb
 - lib/ridley/mixin.rb
+- lib/ridley/mixin/bootstrap_binding.rb
 - lib/ridley/mixin/checksum.rb
 - lib/ridley/mixin/shell_out.rb
 - lib/ridley/resource.rb
@@ -320,10 +347,6 @@ files:
 - lib/ridley/resources/sandbox_resource.rb
 - lib/ridley/resources/search.rb
 - lib/ridley/sandbox_uploader.rb
-- lib/ridley/ssh.rb
-- lib/ridley/ssh/response.rb
-- lib/ridley/ssh/response_set.rb
-- lib/ridley/ssh/worker.rb
 - lib/ridley/version.rb
 - ridley.gemspec
 - spec/acceptance/bootstrapping_spec.rb
@@ -335,7 +358,6 @@ files:
 - spec/acceptance/role_resource_spec.rb
 - spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
-- spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
@@ -357,17 +379,25 @@ files:
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
 - spec/support/spec_helpers.rb
+- spec/unit/ridley/bootstrap_bindings/unix_template_binding_spec.rb
+- spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
-- spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
+- spec/unit/ridley/host_connector/response_set_spec.rb
+- spec/unit/ridley/host_connector/ssh/worker_spec.rb
+- spec/unit/ridley/host_connector/ssh_spec.rb
+- spec/unit/ridley/host_connector/winrm/worker_spec.rb
+- spec/unit/ridley/host_connector/winrm_spec.rb
+- spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
+- spec/unit/ridley/mixin/bootstrap_binding_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb
@@ -379,9 +409,6 @@ files:
 - spec/unit/ridley/resources/sandbox_resource_spec.rb
 - spec/unit/ridley/resources/search_spec.rb
 - spec/unit/ridley/sandbox_uploader_spec.rb
-- spec/unit/ridley/ssh/response_set_spec.rb
-- spec/unit/ridley/ssh/worker_spec.rb
-- spec/unit/ridley/ssh_spec.rb
 - spec/unit/ridley_spec.rb
 homepage: https://github.com/reset/ridley
 licenses:
@@ -399,12 +426,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -3927256690615298092
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
@@ -421,7 +445,6 @@ test_files:
 - spec/acceptance/role_resource_spec.rb
 - spec/acceptance/sandbox_resource_spec.rb
 - spec/acceptance/search_resource_spec.rb
-- spec/fixtures/chefignore
 - spec/fixtures/encrypted_data_bag_secret
 - spec/fixtures/example_cookbook/README.md
 - spec/fixtures/example_cookbook/attributes/default.rb
@@ -443,17 +466,25 @@ test_files:
 - spec/support/filepath_matchers.rb
 - spec/support/shared_examples/ridley_resource.rb
 - spec/support/spec_helpers.rb
+- spec/unit/ridley/bootstrap_bindings/unix_template_binding_spec.rb
+- spec/unit/ridley/bootstrap_bindings/windows_template_binding_spec.rb
 - spec/unit/ridley/bootstrapper/context_spec.rb
 - spec/unit/ridley/bootstrapper_spec.rb
-- spec/unit/ridley/chef/chefignore_spec.rb
 - spec/unit/ridley/chef/cookbook_spec.rb
 - spec/unit/ridley/chef/digester_spec.rb
 - spec/unit/ridley/client_spec.rb
 - spec/unit/ridley/connection_spec.rb
 - spec/unit/ridley/errors_spec.rb
+- spec/unit/ridley/host_connector/response_set_spec.rb
+- spec/unit/ridley/host_connector/ssh/worker_spec.rb
+- spec/unit/ridley/host_connector/ssh_spec.rb
+- spec/unit/ridley/host_connector/winrm/worker_spec.rb
+- spec/unit/ridley/host_connector/winrm_spec.rb
+- spec/unit/ridley/host_connector_spec.rb
 - spec/unit/ridley/middleware/chef_auth_spec.rb
 - spec/unit/ridley/middleware/chef_response_spec.rb
 - spec/unit/ridley/middleware/parse_json_spec.rb
+- spec/unit/ridley/mixin/bootstrap_binding_spec.rb
 - spec/unit/ridley/resource_spec.rb
 - spec/unit/ridley/resources/client_resource_spec.rb
 - spec/unit/ridley/resources/cookbook_resource_spec.rb
@@ -465,8 +496,5 @@ test_files:
 - spec/unit/ridley/resources/sandbox_resource_spec.rb
 - spec/unit/ridley/resources/search_spec.rb
 - spec/unit/ridley/sandbox_uploader_spec.rb
-- spec/unit/ridley/ssh/response_set_spec.rb
-- spec/unit/ridley/ssh/worker_spec.rb
-- spec/unit/ridley/ssh_spec.rb
 - spec/unit/ridley_spec.rb
 has_rdoc: 

data/.rbenv-version

@@ -1 +0,0 @@
-1.9.3-p327

data/lib/ridley/chef/chefignore.rb

@@ -1,76 +0,0 @@
-module Ridley::Chef
-  # Borrowed and modified from:
-  # {https://raw.github.com/opscode/chef/62f9b0e3be8e22eef092163c331b7d3f8d350f94/lib/chef/cookbook/chefignore.rb}
-  #
-  # Copyright:: Copyright (c) 2011 Opscode, Inc.
-  #
-  # 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.
-  class Chefignore
-    class << self
-      # Traverse a path in relative context to find a Chefignore file
-      #
-      # @param [String] path
-      #   path to traverse
-      #
-      # @return [String, nil]
-      def find_relative_to(path)
-        [
-          File.join(path, FILENAME),
-          File.join(path, 'cookbooks', FILENAME)
-        ].find { |f| File.exists?(f) }
-      end
-    end
-
-    FILENAME                = "chefignore".freeze
-    COMMENTS_AND_WHITESPACE = /^\s*(?:#.*)?$/
-
-    attr_reader :ignores
-
-    def initialize(ignore_file_or_repo)
-      @ignore_file = find_ignore_file(ignore_file_or_repo)
-      @ignores     = parse_ignore_file
-    end
-
-    def remove_ignores_from(file_list)
-      Array(file_list).inject([]) do |unignored, file|
-        ignored?(file) ? unignored : unignored << file
-      end
-    end
-
-    def ignored?(file_name)
-      @ignores.any? { |glob| File.fnmatch?(glob, file_name) }
-    end
-
-    private
-
-      def parse_ignore_file
-        ignore_globs = []
-
-        if File.exist?(@ignore_file) && File.readable?(@ignore_file)
-          File.foreach(@ignore_file) do |line|
-            ignore_globs << line.strip unless line =~ COMMENTS_AND_WHITESPACE
-          end
-        end
-
-        ignore_globs
-      end
-
-      def find_ignore_file(path)
-        if File.basename(path) =~ /#{FILENAME}/
-          path
-        else
-          File.join(path, FILENAME)
-        end
-      end
-  end
-end

data/lib/ridley/ssh.rb

@@ -1,56 +0,0 @@
-require 'net/ssh'
-
-module Ridley
-  # @author Jamie Winsor <reset@riotgames.com>
-  class SSH
-    autoload :Response, 'ridley/ssh/response'
-    autoload :ResponseSet, 'ridley/ssh/response_set'
-    autoload :Worker, 'ridley/ssh/worker'
-
-    class << self
-      # @param [Ridley::NodeResource, Array<Ridley::NodeResource>] nodes
-      # @param [Hash] options
-      def start(nodes, options = {}, &block)
-        runner = new(nodes, options)
-        result = yield runner
-        runner.terminate
-
-        result
-      end
-    end
-
-    include Celluloid
-    include Celluloid::Logger
-
-    attr_reader :nodes
-    attr_reader :options
-
-    # @param [Ridley::NodeResource, Array<Ridley::NodeResource>] nodes
-    # @param [Hash] options
-    #   @see Net::SSH
-    def initialize(nodes, options = {})
-      @nodes   = Array(nodes)
-      @options = options
-    end
-
-    # @param [String] command
-    #
-    # @return [Array]
-    def run(command)
-      workers = Array.new
-      futures = self.nodes.collect do |node|
-        workers << worker = Worker.new_link(self.options.freeze)
-        worker.future.run(node.public_hostname, command)
-      end
-
-      ResponseSet.new.tap do |response_set|
-        futures.each do |future|
-          status, response = future.value
-          response_set.add_response(response)
-        end
-      end
-    ensure
-      workers.map(&:terminate)
-    end
-  end
-end

data/lib/ridley/ssh/worker.rb

@@ -1,87 +0,0 @@
-module Ridley
-  class SSH
-    # @author Jamie Winsor <reset@riotgames.com>
-    # @api private
-    class Worker
-      include Celluloid
-      include Celluloid::Logger
-
-      attr_reader :sudo
-      attr_reader :user
-      # @return [Hashie::Mash]
-      attr_reader :options
-      
-      # @param [Hash] options
-      def initialize(options = {})
-        @options = options.deep_symbolize_keys
-        @sudo    = @options[:sudo]
-        @user    = @options[:user]
-
-        @options[:paranoid] = false
-      end
-
-      # @param [String] host
-      # @param [String] command
-      #
-      # @return [Array]
-      def run(host, command)
-        response = Response.new(host)
-        debug "Running SSH command: '#{command}' on: '#{host}' as: '#{user}'"
-
-        Net::SSH.start(host, user, options.slice(*Net::SSH::VALID_OPTIONS)) do |ssh|
-          ssh.open_channel do |channel|
-            if self.sudo
-              channel.request_pty
-            end
-
-            channel.exec(command) do |ch, success|
-              unless success
-                raise "FAILURE: could not execute command"
-              end
-
-              channel.on_data do |ch, data|
-                response.stdout += data
-                info "NODE[#{host}] #{data}" if data.present? and data != "\r\n"
-              end
-
-              channel.on_extended_data do |ch, type, data|
-                response.stderr += data
-                info "NODE[#{host}] #{data}" if data.present? and data != "\r\n"
-              end
-
-              channel.on_request("exit-status") do |ch, data|
-                response.exit_code = data.read_long
-              end
-
-              channel.on_request("exit-signal") do |ch, data|
-                response.exit_signal = data.read_string
-              end
-            end
-          end
-
-          ssh.loop
-        end
-
-        case response.exit_code
-        when 0
-          debug "Successfully ran SSH command on: '#{host}' as: '#{user}'"
-          [ :ok, response ]
-        else
-          error "Successfully ran SSH command on: '#{host}' as: '#{user}', but it failed"
-          error response.stdout
-          [ :error, response ]
-        end
-      rescue => e
-        error "Failed to run SSH command on: '#{host}' as: '#{user}'"
-        error "#{e.class}: #{e.message}"
-        response.exit_code = -1
-        response.stderr = e.message
-        [ :error, response ]
-      end
-
-      private
-
-        attr_reader :runner
-    end
-  end
-end