r10k 0.0.9 → 1.0.0rc1

data/spec/unit/module_spec.rb

@@ -0,0 +1,29 @@
+require 'spec_helper'
+require 'r10k/module'
+
+describe R10K::Module do
+  describe 'delegating to R10K::Module::Git' do
+    it "accepts args {:git => 'git url}" do
+      obj = R10K::Module.new('foo', '/modulepath', :git => 'git url')
+      obj.should be_a_kind_of R10K::Module::Git
+    end
+  end
+
+  describe 'delegating to R10K::Module::Git' do
+    it "accepts name matching 'username/modulename' and no args" do
+      obj = R10K::Module.new('bar/quux', '/modulepath', [])
+      obj.should be_a_kind_of R10K::Module::Forge
+    end
+
+    it "accepts name matching 'username/modulename' and a semver argument" do
+      obj = R10K::Module.new('bar/quux', '/modulepath', '10.0.0')
+      obj.should be_a_kind_of R10K::Module::Forge
+    end
+  end
+
+  it "raises an error if delegation fails" do
+    expect {
+      R10K::Module.new('bar-quux', '/modulepath', ["NOPE NOPE NOPE NOPE!"])
+    }.to raise_error RuntimeError, /doesn't have an implementation/
+  end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 0.0.9
-  prerelease: 
+  version: 1.0.0rc1
+  prerelease: 5
 platform: ruby
 authors:
 - Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-11 00:00:00.000000000 Z
+date: 2013-05-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -60,53 +60,69 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.5.2
 - !ruby/object:Gem::Dependency
-  name: middleware
+  name: log4r
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.1.0
+        version: 1.1.10
 - !ruby/object:Gem::Dependency
-  name: json
+  name: json_pure
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: '0'
   type: :runtime
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.10.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.7.6
+        version: 2.10.0
 - !ruby/object:Gem::Dependency
-  name: log4r
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.10
-  type: :runtime
+        version: 0.10.5
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.10
+        version: 0.10.5
 description: ! "    R10K is an implementation of the Dynamic Puppet environments based
   on git repositories\n    as described in http://puppetlabs.com/blog/git-workflow-and-puppet-environments/.
   It\n    aggressively caches and tries to minimize network activity to ensure that
@@ -118,37 +134,51 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/r10k
-- lib/r10k/action/environment.rb
-- lib/r10k/action/module.rb
-- lib/r10k/action.rb
-- lib/r10k/cli/cache.rb
-- lib/r10k/cli/environment/deploy.rb
+- lib/r10k.rb
+- lib/r10k/errors.rb
+- lib/r10k/logging.rb
+- lib/r10k/deployment.rb
+- lib/r10k/git/errors.rb
+- lib/r10k/git/cache.rb
+- lib/r10k/git/working_dir.rb
+- lib/r10k/git/repository.rb
+- lib/r10k/cli.rb
+- lib/r10k/module.rb
+- lib/r10k/task_runner.rb
+- lib/r10k/execution.rb
+- lib/r10k/puppetfile.rb
+- lib/r10k/deployment/environment.rb
+- lib/r10k/deployment/config/loader.rb
+- lib/r10k/deployment/config.rb
+- lib/r10k/deployment/source.rb
+- lib/r10k/util/purgeable.rb
+- lib/r10k/util/interp.rb
+- lib/r10k/cli/environment.rb
 - lib/r10k/cli/environment/list.rb
+- lib/r10k/cli/environment/deploy.rb
 - lib/r10k/cli/environment/stale.rb
-- lib/r10k/cli/environment.rb
-- lib/r10k/cli/ext/logging.rb
-- lib/r10k/cli/module/deploy.rb
-- lib/r10k/cli/module/list.rb
 - lib/r10k/cli/module.rb
 - lib/r10k/cli/synchronize.rb
-- lib/r10k/cli.rb
-- lib/r10k/config/loader.rb
-- lib/r10k/config.rb
-- lib/r10k/deployment/environment_collection.rb
-- lib/r10k/deployment.rb
-- lib/r10k/errors.rb
-- lib/r10k/librarian/dsl.rb
-- lib/r10k/librarian.rb
-- lib/r10k/logging.rb
+- lib/r10k/cli/puppetfile.rb
+- lib/r10k/cli/deploy.rb
+- lib/r10k/cli/ext/logging.rb
+- lib/r10k/cli/module/list.rb
+- lib/r10k/cli/module/deploy.rb
+- lib/r10k/cli/version.rb
+- lib/r10k/task/environment.rb
+- lib/r10k/task/deployment.rb
+- lib/r10k/task/module.rb
+- lib/r10k/task/puppetfile.rb
+- lib/r10k/task.rb
 - lib/r10k/module/forge.rb
 - lib/r10k/module/git.rb
-- lib/r10k/module.rb
-- lib/r10k/root.rb
-- lib/r10k/synchro/git.rb
-- lib/r10k/util/interp.rb
 - lib/r10k/version.rb
-- lib/r10k.rb
 - lib/semver.rb
+- spec/unit/module_spec.rb
+- spec/unit/git/working_dir_spec.rb
+- spec/unit/git/cache_spec.rb
+- spec/unit/deployment/environment_spec.rb
+- spec/unit/module/forge_spec.rb
 homepage: http://github.com/adrienthebo/r10k
 licenses: []
 post_install_message: 
@@ -164,13 +194,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Dynamic Puppet environments with Git
-test_files: []
+test_files:
+- spec/unit/module_spec.rb
+- spec/unit/git/working_dir_spec.rb
+- spec/unit/git/cache_spec.rb
+- spec/unit/deployment/environment_spec.rb
+- spec/unit/module/forge_spec.rb

data/lib/r10k/action.rb

@@ -1,7 +0,0 @@
-require 'r10k'
-
-module R10K::Action
-end
-
-require 'r10k/action/module'
-require 'r10k/action/environment'

data/lib/r10k/action/environment.rb

@@ -1,74 +0,0 @@
-require 'r10k/action'
-require 'r10k/errors'
-require 'r10k/action/module'
-require 'r10k/deployment'
-require 'r10k/logging'
-
-require 'middleware'
-
-module R10K::Action::Environment
-
-  class Deploy
-    # Middleware action to deploy an environment
-
-    include R10K::Logging
-
-    # @param [Object] app The next application in the middlware stack
-    # @param [R10K::Module] mod The module to deploy
-    def initialize(app, root)
-      @app, @root = app, root
-    end
-
-    # @param [Hash] env
-    #
-    # @option env [true, false] :update_cache
-    # @option env [true, false] :recurse
-    # @option env [true, false] :trace
-    def call(env)
-      @env = env
-
-      logger.info "Deploying environment #{@root.name}"
-      FileUtils.mkdir_p @root.full_path
-      @root.sync! :update_cache => @env[:update_cache]
-
-      if @env[:recurse]
-        # Build a new middleware chain and run it
-        stack = Middleware::Builder.new
-        @root.modules.each { |mod| stack.use R10K::Action::Module::Deploy, mod }
-        stack.call(@env)
-      end
-
-      @app.call(@env)
-    rescue R10K::ExecutionFailure => e
-      logger.error "Could not synchronize #{@root.full_path}: #{e}".red
-      $stderr.puts e.backtrace.join("\n").red if @env[:trace]
-      @app.call(@env)
-    end
-  end
-
-  class Purge
-    # Middleware action to purge stale environments from a directory
-
-    include R10K::Logging
-
-    # @param [Object] app The next application in the middlware stack
-    # @param [String] path The directory path to purge
-    def initialize(app, path)
-      @app, @path = app, path
-    end
-
-    # @param [Hash] env
-    def call(env)
-      @env = env
-
-      stale_directories = R10K::Deployment.collection.stale(@path)
-
-      stale_directories.each do |dir|
-        logger.info "Purging stale environment #{dir.inspect}"
-        FileUtils.rm_rf(dir, :secure => true)
-      end
-
-      @app.call(@env)
-    end
-  end
-end

data/lib/r10k/action/module.rb

@@ -1,36 +0,0 @@
-require 'r10k/action'
-require 'r10k/errors'
-require 'r10k/logging'
-
-require 'middleware'
-
-module R10K::Action::Module
-
-  class R10K::Action::Module::Deploy
-    # Middleware to deploy a module
-
-    include R10K::Logging
-
-    # @param [Object] app The next application in the middlware stack
-    # @param [R10K::Module] mod The module to deploy
-    def initialize(app, mod)
-      @app, @mod = app, mod
-    end
-
-    # @param [Hash] env
-    #
-    # @option env [true, false] :update_cache
-    def call(env)
-      @env = env
-
-      logger.info "Deploying module #{@mod.name}"
-      @mod.sync! :update_cache => @env[:update_cache]
-
-      @app.call(@env)
-    rescue R10K::ExecutionFailure => e
-      logger.error "Could not synchronize #{@mod.full_path}: #{e}".red
-      $stderr.puts e.backtrace.join("\n").red if @env[:trace]
-      @app.call(@env)
-    end
-  end
-end

data/lib/r10k/cli/cache.rb

@@ -1,32 +0,0 @@
-require 'r10k/cli'
-require 'r10k/synchro/git'
-require 'cri'
-require 'r10k/logging'
-
-module R10K::CLI
-  module Cache
-    def self.command
-      @cmd ||= Cri::Command.define do
-        name  'cache'
-        usage 'cache'
-        summary 'Update cache for all sources'
-
-        run do |opts, args, cmd|
-          sources = R10K::Deployment.config[:sources]
-          remotes = Set.new
-
-          sources.each_pair do |name, hash|
-            remotes << hash['remote']
-          end
-
-          remotes.each do |remote|
-            logger.info "Updating cache for #{remote.inspect}"
-            synchro = R10K::Synchro::Git.new(remote)
-            synchro.cache
-          end
-        end
-      end
-    end
-  end
-  self.command.add_command(Cache.command)
-end

data/lib/r10k/config.rb

@@ -1,46 +0,0 @@
-require 'r10k/deployment'
-require 'r10k/config/loader'
-
-class R10K::Config
-
-  attr_accessor :configfile
-
-  def loaded?
-    !(@config.nil?)
-  end
-
-  # Serve up the loaded config if it's already been loaded, otherwise try to
-  # load a config in the current wd.
-  def dump
-    load_config unless @config
-    @config
-  end
-
-  def setting(key)
-    self.dump[key]
-  end
-  alias_method :[], :setting
-
-  # Load and store a config file, and set relevant options
-  #
-  # @param [String] configfile The path to the YAML config file
-  def load_config
-    unless @configfile
-      loader = R10K::Config::Loader.new
-      @configfile = loader.search
-    end
-    File.open(@configfile) { |fh| @config = YAML.load(fh.read) }
-    apply_config_settings
-    @config
-  end
-
-  private
-
-  # Apply config settings to the relevant classes after a config has been loaded.
-  def apply_config_settings
-    if @config[:cachedir]
-      R10K::Synchro::Git.cache_root = @config[:cachedir]
-    end
-    @collection = R10K::Deployment::EnvironmentCollection.new(@config)
-  end
-end

data/lib/r10k/deployment/environment_collection.rb

@@ -1,75 +0,0 @@
-require 'r10k'
-require 'r10k/logging'
-
-class R10K::Deployment::EnvironmentCollection
-
-  include R10K::Logging
-
-  attr_reader :update_cache
-
-  def initialize(config, options = {:update_cache => true})
-    @config       = config
-    @environments = []
-
-    @update_cache = options.delete(:update_cache)
-    load_all
-  end
-
-  def current(basedir)
-    basedir = File.expand_path(basedir)
-    tracked_envs = @environments.select do |env|
-      envdir = File.expand_path(env.basedir)
-      envdir == basedir
-    end
-  end
-
-  # List subdirectories that aren't associated with an env
-  #
-  # If a branch associated with an environment is deleted then the associated
-  # branch ceases to be tracked. This method will scan a directory for
-  # subdirectories and return any subdirectories that don't have an active
-  # branch associated.
-  #
-  # @param [String] basedir The directory to scan
-  #
-  # @return [Array<String>] A list of filenames
-  def stale(basedir)
-    basedir = File.expand_path(basedir)
-
-    all_dirs = Dir.glob("#{basedir}/*").map do |file|
-      File.basename(file) if File.directory?(file)
-    end.compact
-    current_dirs = current(basedir).map(&:name)
-
-    stale_dirs = all_dirs - current_dirs
-
-    stale_dirs.map {|dir| File.join(basedir, dir)}
-  end
-
-  # @return [Array<R10K::Root>]
-  def to_a
-    @environments
-  end
-
-  private
-
-  def load_all
-    @config[:sources].each_pair do |repo_name, repo_config|
-      synchro = R10K::Synchro::Git.new(repo_config['remote'])
-      if @update_cache
-        logger.info "Updating git cache for #{repo_config['remote']}"
-        synchro.cache
-      end
-
-      if repo_config['ref']
-        @environments << R10K::Root.new(repo_config)
-      else
-        synchro.branches.each do |branch|
-          @environments << R10K::Root.new(repo_config.merge({'ref' => branch}))
-        end
-      end
-    end
-
-    @environments
-  end
-end