r10k 0.0.1rc1 → 0.0.1

data/bin/r10k

@@ -1,5 +1,17 @@
 #!/usr/bin/env ruby
 
 require 'r10k/cli'
+require 'colored'
 
-R10K::CLI.command.run(ARGV)
+begin
+  R10K::CLI.command.run(ARGV)
+rescue Interrupt
+  $stderr.puts "Aborted!".red
+  exit(1)
+rescue SystemExit => e
+  exit(e.status)
+rescue Exception => e
+  $stderr.puts "\nRuntime error: #{e.inspect}".red
+  $stderr.puts e.backtrace.join("\n").red if ARGV.include? '--trace'
+  exit(1)
+end

data/lib/r10k.rb

@@ -4,3 +4,4 @@ require 'r10k/root'
 require 'r10k/synchro/git'
 require 'r10k/librarian'
 require 'r10k/version'
+require 'r10k/logging'

data/lib/r10k/action.rb

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

data/lib/r10k/action/environment.rb

@@ -0,0 +1,74 @@
+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.notice "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.instance.collection.stale(@path)
+
+      stale_directories.each do |dir|
+        logger.notice "Purging stale environment #{dir.inspect}"
+        FileUtils.rm_rf(dir, :secure => true)
+      end
+
+      @app.call(@env)
+    end
+  end
+end

data/lib/r10k/action/module.rb

@@ -0,0 +1,36 @@
+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.notice "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.rb

@@ -1,4 +1,5 @@
 require 'r10k'
+require 'r10k/logging'
 require 'cri'
 
 module R10K::CLI
@@ -21,6 +22,12 @@ module R10K::CLI
         R10K::Deployment.instance.configfile = value
       end
 
+      required :v, :verbose, 'Set verbosity level' do |value, cmd|
+        R10K::Logging.level = Integer(value)
+      end
+
+      flag :t, :trace, 'Display stack traces on application crash'
+
       run do |opts, args, cmd|
         puts cmd.help
         exit 0
@@ -31,3 +38,5 @@ end
 
 require 'r10k/cli/environment'
 require 'r10k/cli/module'
+require 'r10k/cli/cache'
+require 'r10k/cli/synchronize'

data/lib/r10k/cli/{environment/cache.rb → cache.rb}

@@ -1,8 +1,8 @@
-require 'r10k/cli/environment'
+require 'r10k/cli'
 require 'r10k/synchro/git'
 require 'cri'
 
-module R10K::CLI::Environment
+module R10K::CLI
   module Cache
     def self.command
       @cmd ||= Cri::Command.define do
@@ -11,8 +11,17 @@ module R10K::CLI::Environment
         summary 'Update cache for all sources'
 
         run do |opts, args, cmd|
-          R10K::Deployment.instance[:sources].each_pair do |name, source|
-            synchro = R10K::Synchro::Git.new(source)
+          sources = R10K::Deployment.instance[:sources]
+
+          remotes = Set.new
+
+          sources.each_pair do |name, hash|
+            remotes << hash['remote']
+          end
+
+          remotes.each do |remote|
+            puts "Synchronizing #{remote}"
+            synchro = R10K::Synchro::Git.new(remote)
             synchro.cache
           end
         end

data/lib/r10k/cli/environment.rb

@@ -9,8 +9,6 @@ module R10K::CLI
         usage 'environment <subcommand>'
         summary 'Operate on a specific environment'
 
-        required :e, :environment, 'Specify a particular environment'
-
         run do |opts, args, cmd|
           puts cmd.help
           exit 0
@@ -23,4 +21,4 @@ end
 
 require 'r10k/cli/environment/list'
 require 'r10k/cli/environment/deploy'
-require 'r10k/cli/environment/cache'
+require 'r10k/cli/environment/stale'

data/lib/r10k/cli/environment/deploy.rb

@@ -1,43 +1,45 @@
 require 'r10k/cli/environment'
 require 'r10k/deployment'
-require 'cri'
+require 'r10k/action'
 
-require 'fileutils'
+require 'cri'
+require 'middleware'
 
 module R10K::CLI::Environment
   module Deploy
     def self.command
       @cmd ||= Cri::Command.define do
         name  'deploy'
-        usage 'deploy'
+        usage 'deploy <environment> <...>'
         summary 'Deploy an environment'
 
         flag :r, :recurse, 'Recursively update submodules'
-
-        required :u, :update, "Enable or disable cache updating"
+        flag :u, :update, "Enable or disable cache updating"
 
         run do |opts, args, cmd|
           deployment = R10K::Deployment.instance
           env_list   = deployment.environments
 
-          update_cache = (defined? opts[:update]) ? (opts[:update] == 'true') : false
-
-          if opts[:environment]
-            environments = env_list.select {|env| env.name == opts[:environment]}
+          if not args.empty?
+            environments = env_list.select {|env| args.include? env.name }
           else
             environments = env_list
           end
 
-          environments.each do |env|
-            FileUtils.mkdir_p env.full_path
-            env.sync! :update_cache => update_cache
-
-            if opts[:recurse]
-              env.modules.each do |mod|
-                mod.sync! :update_cache => update_cache
-              end
+          stack = Middleware::Builder.new do
+            environments.each do |env|
+              use R10K::Action::Environment::Deploy, env
             end
           end
+
+          # Prepare middleware environment
+          stack_env = {
+            :update_cache => opts[:update],
+            :recurse      => opts[:recurse],
+            :trace        => opts[:trace],
+          }
+
+          stack.call(stack_env)
         end
       end
     end

data/lib/r10k/cli/environment/stale.rb

@@ -0,0 +1,34 @@
+require 'r10k/cli/environment'
+require 'r10k/deployment'
+require 'cri'
+
+module R10K::CLI::Environment
+  module Stale
+    def self.command
+      @cmd ||= Cri::Command.define do
+        name  'stale'
+        usage 'stale <directory> [directory ...]'
+        summary 'List all stale environments'
+
+        run do |opts, args, cmd|
+          deployment = R10K::Deployment.instance
+
+          if args.empty?
+            $stderr.print "ERROR: ".red
+            $stderr.puts "#{cmd.name} requires one or more directories"
+            $stderr.puts cmd.help
+            exit(1)
+          end
+
+          args.each do |dir|
+            puts "Stale environments in #{dir}:"
+            output = deployment.collection.stale(dir).each do |stale_dir|
+              puts "  - #{stale_dir}"
+            end
+          end
+        end
+      end
+    end
+  end
+  self.command.add_command(Stale.command)
+end

data/lib/r10k/cli/module/deploy.rb

@@ -9,10 +9,10 @@ module R10K::CLI::Module
     def self.command
       @cmd ||= Cri::Command.define do
         name  'deploy'
-        usage 'deploy <module name>'
+        usage 'deploy [module name] <module name> ...'
         summary 'Deploy a module'
 
-        required :u, :update, "Enable or disable cache updating"
+        flag :u, :update, "Update module cache"
 
         run do |opts, args, cmd|
 
@@ -21,10 +21,7 @@ module R10K::CLI::Module
             exit 1
           end
 
-          deployment = R10K::Deployment.instance
-          env_list   = deployment.environments
-
-          update_cache = (defined? opts[:update]) ? (opts[:update] == 'true') : false
+          env_list = R10K::Deployment.instance.environments
 
           if opts[:environment]
             environments = env_list.select {|env| env.name == opts[:environment]}
@@ -33,9 +30,6 @@ module R10K::CLI::Module
           end
 
           environments.each do |env|
-            FileUtils.mkdir_p env.full_path
-            env.sync! :update_cache => update_cache
-
             mods = env.modules.select { |mod| mod.name == module_name }
 
             if mods.empty?
@@ -43,9 +37,15 @@ module R10K::CLI::Module
               exit 1
             end
 
-            mods.each do |mod|
-              mod.sync! :update_cache => update_cache
-            end
+            stack = Middleware::Builder.new
+            mods.each { |mod| stack.use R10K::Action::Module::Deploy, mod }
+
+            stack_env = {
+              :update_cache => opts[:update],
+              :trace        => opts[:trace],
+            }
+
+            stack.call(stack_env)
           end
         end
       end

data/lib/r10k/cli/synchronize.rb

@@ -0,0 +1,45 @@
+require 'r10k/cli'
+require 'r10k/deployment'
+require 'r10k/action/environment'
+
+require 'middleware'
+require 'cri'
+
+module R10K::CLI
+  module Synchronize
+    def self.command
+      @cmd ||= Cri::Command.define do
+        name  'synchronize'
+        usage 'synchronize <options>'
+        summary 'Fully synchronize all environments'
+
+        flag :u, :update, "Update cache before running"
+
+        run do |opts, args, cmd|
+          deployment   = R10K::Deployment.instance
+          environments = deployment.environments
+          directories  = (deployment.config[:purgedirs] || [])
+
+          stack = Middleware::Builder.new do
+            environments.each do |env|
+              use R10K::Action::Environment::Deploy, env
+            end
+
+            directories.each do |dir|
+              use R10K::Action::Environment::Purge, dir
+            end
+          end
+
+          stack_env = {
+            :update_cache => opts[:update],
+            :trace        => opts[:trace],
+            :recurse      => true,
+          }
+
+          stack.call(stack_env)
+        end
+      end
+    end
+  end
+  self.command.add_command(Synchronize.command)
+end

data/lib/r10k/deployment.rb

@@ -1,6 +1,6 @@
 require 'r10k'
 require 'r10k/synchro/git'
-require 'r10k/environment_collection'
+require 'r10k/deployment/environment_collection'
 require 'yaml'
 
 class R10K::Deployment
@@ -21,10 +21,14 @@ class R10K::Deployment
   #
   # @return [Array<R10K::Root>]
   def environments
-    collection = R10K::EnvironmentCollection.new(config)
     collection.to_a
   end
 
+  def collection
+    load_config unless @config
+    @collection
+  end
+
   # Serve up the loaded config if it's already been loaded, otherwise try to
   # load a config in the current wd.
   def config
@@ -47,8 +51,6 @@ class R10K::Deployment
     File.open(@configfile) { |fh| @config = YAML.load(fh.read) }
     apply_config_settings
     @config
-  rescue => e
-    raise "Couldn't load #{configfile}: #{e}"
   end
 
   # Apply config settings to the relevant classes after a config has been loaded.
@@ -56,5 +58,6 @@ class R10K::Deployment
     if @config[:cachedir]
       R10K::Synchro::Git.cache_root = @config[:cachedir]
     end
+    @collection = R10K::EnvironmentCollection.new(@config)
   end
 end

data/lib/r10k/{environment_collection.rb → deployment/environment_collection.rb}

@@ -4,15 +4,22 @@ class R10K::EnvironmentCollection
 
   attr_reader :update_cache
 
-  def initialize(config, options = {:update_cache => true})
+  def initialize(config, options = {:update_cache => false})
     @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
@@ -23,8 +30,17 @@ class R10K::EnvironmentCollection
   # @param [String] basedir The directory to scan
   #
   # @return [Array<String>] A list of filenames
-  def untracked_environments(basedir)
-    raise NotImplementedError
+  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>]

data/lib/r10k/errors.rb

@@ -0,0 +1,7 @@
+require 'r10k'
+
+module R10K
+  class ExecutionFailure < Exception
+    attr_accessor :exit_code, :stdout, :stderr
+  end
+end

data/lib/r10k/logging.rb

@@ -0,0 +1,49 @@
+require 'r10k'
+
+require 'log4r'
+require 'log4r/configurator'
+
+module R10K::Logging
+
+  include Log4r
+
+  def logger
+    unless @logger
+      @logger = Log4r::Logger.new(self.class.name)
+      @logger.add R10K::Logging.outputter
+    end
+    @logger
+  end
+
+  class << self
+
+  include Log4r
+    def included(klass)
+      unless @log4r_loaded
+        Configurator.custom_levels(*%w{DEBUG2 DEBUG1 DEBUG INFO NOTICE WARN ERROR FATAL})
+        Logger.global.level = Log4r::ALL
+        @log4r_loaded = true
+      end
+    end
+
+    def level
+      @level || Log4r::WARN # Default level is WARN
+    end
+
+    def level=(val)
+      outputter.level = val
+      @level = val
+    end
+
+    def formatter
+      @formatter ||= Log4r::PatternFormatter.new(:pattern => '[%C - %l] %m')
+    end
+
+    def outputter
+      @outputter ||= Log4r::StderrOutputter.new('console',
+        :level => self.level,
+        :formatter => formatter
+       )
+    end
+  end
+end

data/lib/r10k/module/forge.rb

@@ -1,19 +1,84 @@
 require 'r10k'
 require 'r10k/module'
+require 'r10k/errors'
+require 'r10k/logging'
+
+require 'systemu'
+require 'semver'
+require 'json'
 
 class R10K::Module::Forge < R10K::Module
 
   def self.implements(name, args)
-    args.is_a? String and args.match /\d+\.\d+\.\d+/
+    args.is_a? String and SemVer.valid?(args)
   end
 
+  include R10K::Logging
+
   def initialize(name, path, args)
     super
 
-    @version = @args
+    @full_name = name
+
+    @owner, @name = name.split('/')
+    @version = SemVer.new(@args)
   end
 
   def sync!(options = {})
-    puts "#{self.class.name}#sync! is not implemented. Doing nothing."
+    return if insync?
+
+    if insync?
+      logger.debug1 "Module #{@full_name} already matches version #{@version}"
+    elsif File.exist? metadata_path
+      logger.debug "Module #{@full_name} is installed but doesn't match version #{@version}, upgrading"
+      cmd = []
+      cmd << 'upgrade'
+      cmd << "--version=#{@version}"
+      cmd << "--ignore-dependencies"
+      cmd << @full_name
+      pmt cmd
+    else
+      logger.debug "Module #{@full_name} is not installed"
+      cmd = []
+      cmd << 'install'
+      cmd << "--version=#{@version}"
+      cmd << "--ignore-dependencies"
+      cmd << @full_name
+      pmt cmd
+    end
+  end
+
+  private
+
+  def current_version
+    SemVer.new(metadata['version'])
+  end
+
+  def insync?
+    @version == current_version
+  rescue
+    false
+  end
+
+  def metadata
+    JSON.parse(File.read(metadata_path))
+  end
+
+  def metadata_path
+    File.join(full_path, 'metadata.json')
+  end
+
+  def pmt(args)
+    cmd = "puppet module --modulepath '#{@path}' #{args.join(' ')}"
+    logger.debug1 "Execute: #{cmd}"
+    status, stdout, stderr = systemu(cmd)
+    unless status == 0
+      e = R10K::ExecutionFailure.new("#{cmd.inspect} returned with non-zero exit value #{status.inspect}")
+      e.exit_code = status
+      e.stdout    = stdout
+      e.stderr    = stderr
+      raise e
+    end
+    stdout
   end
 end

data/lib/r10k/synchro/git.rb

@@ -1,5 +1,8 @@
 require 'r10k'
-require 'shellter'
+require 'r10k/errors'
+require 'r10k/logging'
+
+require 'systemu'
 require 'fileutils'
 
 module R10K::Synchro; end
@@ -39,6 +42,8 @@ class R10K::Synchro::Git
     end
   end
 
+  include R10K::Logging
+
   attr_reader :remote
 
   # Instantiates a new git synchro and optionally prepares for caching
@@ -48,7 +53,7 @@ class R10K::Synchro::Git
     @remote = remote
 
     if self.class.cache_root
-      @cache_path = File.join(self.class.cache_root, @remote.gsub(/[^@\w-]/, '-'))
+      @cache_path = File.join(self.class.cache_root, @remote.gsub(/[^@\w\.-]/, '-'))
     end
   end
 
@@ -69,7 +74,7 @@ class R10K::Synchro::Git
   end
 
   # @return [TrueClass] if the git repository is cached
-  def has_cache?
+  def cached?
     @cache_path and File.directory? @cache_path
   end
 
@@ -94,10 +99,13 @@ class R10K::Synchro::Git
 
   # Force a cache refresh
   def cache!
-    if has_cache?
-      git "--git-dir #{@cache_path} fetch --prune"
+    if cached?
+      logger.debug "Updating existing cache at #{@cache_path}"
+      git "fetch --prune", :git_dir => @cache_path
     else
-      FileUtils.mkdir_p File.dirname(File.join(@cache_path))
+      logger.debug "No cache for #{@remote.inspect}, forcing cache build"
+      cache_root = self.class.cache_root
+      FileUtils.mkdir_p cache_root unless File.exist? cache_root
       git "clone --mirror #{@remote} #{@cache_path}"
     end
   end
@@ -106,9 +114,9 @@ class R10K::Synchro::Git
   # object.
   #
   # @return [Array<String>] A list of all cached remote branches
-  def branches
-    cache
-    output = git "--git-dir #{@cache_path} branch"
+  def branches(options = {:update_cache => false})
+    cache if (options[:update_cache] or not cached?)
+    output = git "branch", :git_dir => @cache_path
     output.split("\n").map { |str| str[2..-1] }
   end
 
@@ -121,8 +129,9 @@ class R10K::Synchro::Git
   #
   # @param [String] path The directory to create the repo working directory
   def clone(path)
-    if has_cache?
+    if cached?
       git "clone --reference #{@cache_path} #{@remote} #{path}"
+      git "remote add cache #{@cache_path}", :path => path
     else
       FileUtils.mkdir_p path unless File.directory? path
       git "clone #{@remote} #{path}"
@@ -130,10 +139,10 @@ class R10K::Synchro::Git
   end
 
   def fetch(path)
-    if has_cache?
-      git "fetch --prune #{@cache_path}", path
+    if cached?
+      git "fetch --prune cache", :path => path
     else
-      git "fetch --prune", path
+      git "fetch --prune origin", :path => path
     end
   end
 
@@ -142,45 +151,76 @@ class R10K::Synchro::Git
   # @param [String] path The path to the working directory of the git repo
   # @param [String] ref The git reference to reset to.
   def reset(path, ref)
+    commit = resolve_commit(ref)
 
-    # Helloooo, hackery. Try to parse the ref as a commit object. If that fails
-    # this probably means that the ref is a remote branch. For the sake of
-    # brevity this code blindly makes that assumption on the failure of 
-    # `git rev-parse`.
     begin
-      commit = git "--git-dir #{@cache_path} rev-parse #{ref}^{commit}"
-    rescue RuntimeError => e
-      commit = "origin/#{ref}"
+      git "reset --hard #{commit}", :path => path
+    rescue R10K::ExecutionFailure => e
+      logger.error "Unable to locate commit object #{commit} in git repo #{path}"
+      raise
     end
+  end
 
-    git "reset --hard #{commit}", path
+  # Resolve a ref to a commit hash
+  #
+  # @param [String] ref
+  #
+  # @return [String] The dereferenced hash of `ref`
+  def resolve_commit(ref)
+    commit = git "rev-parse #{ref}^{commit}", :git_dir => @cache_path
+    commit.chomp
+  rescue R10K::ExecutionFailure => e
+    logger.error "Could not resolve ref #{ref.inspect} for git cache #{@cache_path}"
+    raise
   end
 
   # Wrap git commands
   #
   # @param [String] command_line_args The arguments for the git prompt
-  # @param [String] git_dir An optional git working directory
+  # @param [Hash] opts
+  #
+  # @option opts [String] :git_dir
+  # @option opts [String] :work_tree
+  # @option opts [String] :work_tree
   #
   # @return [String] The git command output
-  def git(command_line_args, git_dir = nil)
-    args = []
+  def git(command_line_args, opts = {})
+    args = %w{git}
 
-    if git_dir
-      args << "--work-tree" << git_dir
-      args << "--git-dir"   << "#{git_dir}/.git"
+    log_event = "git #{command_line_args}"
+    log_event << ", args: #{opts.inspect}" unless opts.empty?
+
+
+    if opts[:path]
+      args << "--git-dir #{opts[:path]}/.git"
+      args << "--work-tree #{opts[:path]}"
+    else
+      if opts[:git_dir]
+        args << "--git-dir #{opts[:git_dir]}"
+      end
+      if opts[:work_tree]
+        args << "--work-tree #{opts[:work_tree]}"
+      end
     end
 
-    args << command_line_args.split(/\s+/)
+    logger.debug1 "Execute: '#{log_event}'"
 
-    result = Shellter.run!('git', args.join(' '))
-    puts "Execute: #{result.last_command}".green
+    args << command_line_args
+    cmd = args.join(' ')
 
-    stderr = result.stderr.read
-    stdout = result.stdout.read
+    status, stdout, stderr = systemu(cmd)
 
-    puts stdout.blue unless stdout.empty?
-    puts stderr.red  unless stderr.empty?
+    logger.debug2 "[#{log_event}] STDOUT: #{stdout.chomp}" unless stdout.empty?
+    logger.debug2 "[#{log_event}] STDERR: #{stderr.chomp}" unless stderr.empty?
 
+    unless status == 0
+      msg = "#{cmd.inspect} returned with non-zero exit value #{status.exitstatus}"
+      e = R10K::ExecutionFailure.new(msg)
+      e.exit_code = status
+      e.stdout    = stdout
+      e.stderr    = stderr
+      raise e
+    end
     stdout
   end
 end

data/lib/r10k/version.rb

@@ -1,3 +1,3 @@
 module R10K
-  VERSION = '0.0.1rc1'
+  VERSION = '0.0.1'
 end

data/lib/semver.rb

@@ -0,0 +1,124 @@
+# Ripped off from puppetlabs/puppet
+
+# We need to subclass Numeric to force range comparisons not to try to iterate over SemVer
+# and instead use numeric comparisons (eg >, <, >=, <=)
+# Ruby 1.8 already did this for all ranges, but Ruby 1.9 changed range include behavior
+class SemVer < Numeric
+  include Comparable
+
+  VERSION = /^v?(\d+)\.(\d+)\.(\d+)(-[0-9A-Za-z-]*|)$/
+  SIMPLE_RANGE = /^v?(\d+|[xX])(?:\.(\d+|[xX])(?:\.(\d+|[xX]))?)?$/
+
+  def self.valid?(ver)
+    VERSION =~ ver
+  end
+
+  def self.find_matching(pattern, versions)
+    versions.select { |v| v.matched_by?("#{pattern}") }.sort.last
+  end
+
+  def self.pre(vstring)
+    vstring =~ /-/ ? vstring : vstring + '-'
+  end
+
+  def self.[](range)
+    range.gsub(/([><=])\s+/, '\1').split(/\b\s+(?!-)/).map do |r|
+      case r
+      when SemVer::VERSION
+        SemVer.new(pre(r)) .. SemVer.new(r)
+      when SemVer::SIMPLE_RANGE
+        r += ".0" unless SemVer.valid?(r.gsub(/x/i, '0'))
+        SemVer.new(r.gsub(/x/i, '0'))...SemVer.new(r.gsub(/(\d+)\.x/i) { "#{$1.to_i + 1}.0" } + '-')
+      when /\s+-\s+/
+        a, b = r.split(/\s+-\s+/)
+        SemVer.new(pre(a)) .. SemVer.new(b)
+      when /^~/
+        ver = r.sub(/~/, '').split('.').map(&:to_i)
+        start = (ver + [0] * (3 - ver.length)).join('.')
+
+        ver.pop unless ver.length == 1
+        ver[-1] = ver.last + 1
+
+        finish = (ver + [0] * (3 - ver.length)).join('.')
+        SemVer.new(pre(start)) ... SemVer.new(pre(finish))
+      when /^>=/
+        ver = r.sub(/^>=/, '')
+        SemVer.new(pre(ver)) .. SemVer::MAX
+      when /^<=/
+        ver = r.sub(/^<=/, '')
+        SemVer::MIN .. SemVer.new(ver)
+      when /^>/
+        if r =~ /-/
+          ver = [r[1..-1]]
+        else
+          ver = r.sub(/^>/, '').split('.').map(&:to_i)
+          ver[2] = ver.last + 1
+        end
+        SemVer.new(ver.join('.') + '-') .. SemVer::MAX
+      when /^</
+        ver = r.sub(/^</, '')
+        SemVer::MIN ... SemVer.new(pre(ver))
+      else
+        (1..1)
+      end
+    end.inject { |a,e| a & e }
+  end
+
+  attr_reader :major, :minor, :tiny, :special
+
+  def initialize(ver)
+    unless SemVer.valid?(ver)
+      raise ArgumentError.new("Invalid version string '#{ver}'!")
+    end
+
+    @major, @minor, @tiny, @special = VERSION.match(ver).captures.map do |x|
+      # Because Kernel#Integer tries to interpret hex and octal strings, which
+      # we specifically do not want, and which cannot be overridden in 1.8.7.
+      Float(x).to_i rescue x
+    end
+  end
+
+  def <=>(other)
+    other = SemVer.new("#{other}") unless other.is_a? SemVer
+    return self.major <=> other.major unless self.major == other.major
+    return self.minor <=> other.minor unless self.minor == other.minor
+    return self.tiny  <=> other.tiny  unless self.tiny  == other.tiny
+
+    return 0  if self.special  == other.special
+    return 1  if self.special  == ''
+    return -1 if other.special == ''
+
+    return self.special <=> other.special
+  end
+
+  def matched_by?(pattern)
+    # For the time being, this is restricted to exact version matches and
+    # simple range patterns.  In the future, we should implement some or all of
+    # the comparison operators here:
+    # https://github.com/isaacs/node-semver/blob/d474801/semver.js#L340
+
+    case pattern
+    when SIMPLE_RANGE
+      pattern = SIMPLE_RANGE.match(pattern).captures
+      pattern[1] = @minor unless pattern[1] && pattern[1] !~ /x/i
+      pattern[2] = @tiny  unless pattern[2] && pattern[2] !~ /x/i
+      [@major, @minor, @tiny] == pattern.map { |x| x.to_i }
+    when VERSION
+      self == SemVer.new(pattern)
+    else
+      false
+    end
+  end
+
+  def inspect
+    @vstring || "v#{@major}.#{@minor}.#{@tiny}#{@special}"
+  end
+  alias :to_s :inspect
+
+  MIN = SemVer.new('0.0.0-')
+  MIN.instance_variable_set(:@vstring, 'vMIN')
+
+  MAX = SemVer.new('8.0.0')
+  MAX.instance_variable_set(:@major, (1.0/0)) # => Infinity
+  MAX.instance_variable_set(:@vstring, 'vMAX')
+end

metadata

@@ -1,16 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: r10k
 version: !ruby/object:Gem::Version
-  version: 0.0.1rc1
-  prerelease: 5
+  version: 0.0.1
+  prerelease: 
 platform: ruby
 authors:
-- adrien@somethingsinistral.net
+- Adrien Thebo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-26 00:00:00.000000000 Z
+date: 2013-01-04 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colored
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: cri
   requirement: !ruby/object:Gem::Requirement
@@ -28,13 +44,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.3.0
 - !ruby/object:Gem::Dependency
-  name: shellter
+  name: systemu
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 2.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,15 +58,15 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.6
+        version: 2.5.2
 - !ruby/object:Gem::Dependency
-  name: popen4
+  name: middleware
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,30 +74,69 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: 0.1.0
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 1.7.6
+- !ruby/object:Gem::Dependency
+  name: log4r
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.1.10
 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
   interactive\n    deployment is as fast as possible.\n"
-email: 
+email: adrien@somethingsinistral.net
 executables:
 - r10k
 extensions: []
 extra_rdoc_files: []
 files:
 - bin/r10k
-- lib/r10k/cli/environment/cache.rb
+- 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/cli/environment/list.rb
+- lib/r10k/cli/environment/stale.rb
 - lib/r10k/cli/environment.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/deployment/environment_collection.rb
 - lib/r10k/deployment.rb
-- lib/r10k/environment_collection.rb
+- lib/r10k/errors.rb
 - lib/r10k/librarian/dsl.rb
 - lib/r10k/librarian.rb
+- lib/r10k/logging.rb
 - lib/r10k/module/forge.rb
 - lib/r10k/module/git.rb
 - lib/r10k/module.rb
@@ -90,6 +145,7 @@ files:
 - lib/r10k/util/interp.rb
 - lib/r10k/version.rb
 - lib/r10k.rb
+- lib/semver.rb
 homepage: http://github.com/adrienthebo/r10k
 licenses: []
 post_install_message: 
@@ -105,9 +161,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23