leap_cli 1.6.2 → 1.7.3

data/lib/leap_cli/config/object_list.rb

@@ -174,7 +174,7 @@ module LeapCli
           if self[name]
             self[name].inherit_from!(object)
           else
-            self[name] = object.dup
+            self[name] = object.deep_dup
           end
         end
       end

data/lib/leap_cli/config/secrets.rb

@@ -13,18 +13,29 @@ module LeapCli; module Config
       @discovered_keys = {}
     end
 
-     # we can't use fetch() or get(), since those already have special meanings
-     def retrieve(key, environment=nil)
-       self.fetch(environment||'default', {})[key.to_s]
-     end
+    # we can't use fetch() or get(), since those already have special meanings
+    def retrieve(key, environment)
+      self.fetch(environment, {})[key.to_s]
+    end
+
+    def set(*args, &block)
+      if block_given?
+        set_with_block(*args, &block)
+      else
+        set_without_block(*args)
+      end
+    end
+
+    def set_without_block(key, value, environment)
+      set_with_block(key, environment) {value}
+    end
 
-    def set(key, value, environment=nil)
-      environment ||= 'default'
+    def set_with_block(key, environment, &block)
       key = key.to_s
       @discovered_keys[environment] ||= {}
       @discovered_keys[environment][key] = true
       self[environment] ||= {}
-      self[environment][key] ||= value
+      self[environment][key] ||= yield
     end
 
     #

data/lib/leap_cli/config/sources.rb

@@ -0,0 +1,11 @@
+# encoding: utf-8
+#
+# A class for the sources.json file
+#
+
+module LeapCli
+  module Config
+    class Sources < Object
+    end
+  end
+end

data/lib/leap_cli/core_ext/deep_dup.rb

@@ -0,0 +1,53 @@
+unless Hash.method_defined?(:deep_dup)
+
+  class Array
+    def deep_dup
+      map { |it| it.deep_dup }
+    end
+  end
+
+  class Hash
+    def deep_dup
+      each_with_object(dup) do |(key, value), hash|
+        hash[key.deep_dup] = value.deep_dup
+      end
+    end
+  end
+
+  class String
+    def deep_dup
+      self.dup
+    end
+  end
+
+  class Integer
+    def deep_dup
+      self
+    end
+  end
+
+  class Float
+    def deep_dup
+      self
+    end
+  end
+
+  class TrueClass
+    def deep_dup
+      self
+    end
+  end
+
+  class FalseClass
+    def deep_dup
+      self
+    end
+  end
+
+  class NilClass
+    def deep_dup
+      self
+    end
+  end
+
+end

data/lib/leap_cli/core_ext/time.rb

@@ -0,0 +1,86 @@
+#
+# The following methods are copied from ActiveSupport's Time extension:
+# activesupport/lib/active_support/core_ext/time/calculations.rb
+#
+
+class Time
+
+  #
+  # Uses Date to provide precise Time calculations for years, months, and days
+  # according to the proleptic Gregorian calendar. The options parameter takes
+  # a hash with any of these keys: :years, :months, :weeks, :days, :hours,
+  # :minutes, :seconds.
+  #
+  def advance(options)
+    unless options[:weeks].nil?
+      options[:weeks], partial_weeks = options[:weeks].divmod(1)
+      options[:days] = options.fetch(:days, 0) + 7 * partial_weeks
+    end
+
+    unless options[:days].nil?
+      options[:days], partial_days = options[:days].divmod(1)
+      options[:hours] = options.fetch(:hours, 0) + 24 * partial_days
+    end
+
+    d = to_date.advance(options)
+    d = d.gregorian if d.julian?
+    time_advanced_by_date = change(:year => d.year, :month => d.month, :day => d.day)
+    seconds_to_advance = options.fetch(:seconds, 0) +
+                         options.fetch(:minutes, 0) * 60 +
+                         options.fetch(:hours, 0) * 3600
+
+    if seconds_to_advance.zero?
+      time_advanced_by_date
+    else
+      time_advanced_by_date.since(seconds_to_advance)
+    end
+  end
+
+  def since(seconds)
+    self + seconds
+  rescue
+    to_datetime.since(seconds)
+  end
+
+  #
+  # Returns a new Time where one or more of the elements have been changed
+  # according to the options parameter. The time options (:hour, :min, :sec,
+  # :usec) reset cascadingly, so if only the hour is passed, then minute, sec,
+  # and usec is set to 0. If the hour and minute is passed, then sec and usec
+  # is set to 0. The options parameter takes a hash with any of these keys:
+  # :year, :month, :day, :hour, :min, :sec, :usec.
+  #
+  def change(options)
+    new_year  = options.fetch(:year, year)
+    new_month = options.fetch(:month, month)
+    new_day   = options.fetch(:day, day)
+    new_hour  = options.fetch(:hour, hour)
+    new_min   = options.fetch(:min, options[:hour] ? 0 : min)
+    new_sec   = options.fetch(:sec, (options[:hour] || options[:min]) ? 0 : sec)
+    new_usec  = options.fetch(:usec, (options[:hour] || options[:min] || options[:sec]) ? 0 : Rational(nsec, 1000))
+
+    if utc?
+      ::Time.utc(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    elsif zone
+      ::Time.local(new_year, new_month, new_day, new_hour, new_min, new_sec, new_usec)
+    else
+      ::Time.new(new_year, new_month, new_day, new_hour, new_min, new_sec + (new_usec.to_r / 1000000), utc_offset)
+    end
+  end
+
+end
+
+class Date
+
+  # activesupport/lib/active_support/core_ext/date/calculations.rb
+  def advance(options)
+    options = options.dup
+    d = self
+    d = d >> options.delete(:years) * 12 if options[:years]
+    d = d >> options.delete(:months)     if options[:months]
+    d = d +  options.delete(:weeks) * 7  if options[:weeks]
+    d = d +  options.delete(:days)       if options[:days]
+    d
+  end
+
+end

data/lib/leap_cli/leapfile.rb

@@ -47,6 +47,12 @@ module LeapCli
         # set up paths
         #
         @provider_directory_path = directory
+        begin
+          # load leaprc first, so that we can potentially access which environment is pinned in Leapfile
+          # but also load leaprc last, so that it can override what is set in Leapfile.
+          read_settings(leaprc_path)
+        rescue StandardError
+        end
         read_settings(directory + '/Leapfile')
         read_settings(leaprc_path)
         @platform_directory_path = File.expand_path(@platform_directory_path || '../leap_platform', @provider_directory_path)
@@ -54,25 +60,26 @@ module LeapCli
         #
         # load the platform
         #
-        require "#{@platform_directory_path}/platform.rb"
-        if !Leap::Platform.compatible_with_cli?(LeapCli::VERSION)
-          Util.bail! "This leap command (v#{LeapCli::VERSION}) " +
-                     "is not compatible with the platform #{@platform_directory_path} (v#{Leap::Platform.version}). " +
-                     "You need leap command #{Leap::Platform.compatible_cli.first} to #{Leap::Platform.compatible_cli.last}."
+        platform_file = "#{@platform_directory_path}/platform.rb"
+        unless File.exists?(platform_file)
+          Util.bail! "ERROR: The file `#{platform_file}` does not exist. Please check the value of `@platform_directory_path` in `Leapfile` or `~/.leaprc`."
         end
-        if !Leap::Platform.version_in_range?(LeapCli::COMPATIBLE_PLATFORM_VERSION)
+        require "#{@platform_directory_path}/platform.rb"
+        if !Leap::Platform.compatible_with_cli?(LeapCli::VERSION) ||
+           !Leap::Platform.version_in_range?(LeapCli::COMPATIBLE_PLATFORM_VERSION)
           Util.bail! "This leap command (v#{LeapCli::VERSION}) " +
-                     "is not compatible with the platform #{@platform_directory_path} (v#{Leap::Platform.version}). " +
-                     "You need platform version #{LeapCli::COMPATIBLE_PLATFORM_VERSION.first} to #{LeapCli::COMPATIBLE_PLATFORM_VERSION.last}."
+                     "is not compatible with the platform #{@platform_directory_path} (v#{Leap::Platform.version}).\n   " +
+                     "You need either leap command #{Leap::Platform.compatible_cli.first} to #{Leap::Platform.compatible_cli.last} or " +
+                     "platform version #{LeapCli::COMPATIBLE_PLATFORM_VERSION.first} to #{LeapCli::COMPATIBLE_PLATFORM_VERSION.last}"
         end
-
         unless @allow_production_deploy.nil?
           Util::log 0, :warning, "in Leapfile: @allow_production_deploy is no longer supported."
         end
         unless @platform_branch.nil?
           Util::log 0, :warning, "in Leapfile: @platform_branch is no longer supported."
         end
-        return true
+        @valid = true
+        return @valid
       end
     end
 
@@ -84,6 +91,10 @@ module LeapCli
       edit_leaprc(property)
     end
 
+    def valid?
+      !!@valid
+    end
+
     private
 
     #

data/lib/leap_cli/logger.rb

@@ -113,8 +113,8 @@ module LeapCli
       { :match => /sh: .+: command not found/, :color => :magenta, :match_level => 1, :priority => -30 },
 
       # IMPORTANT
-      { :match => /^err ::/,                   :color => :red,     :match_level => 0, :priority => -10 },
-      { :match => /^ERROR:/,                   :color => :red,     :match_level => 0, :priority => -10 },
+      { :match => /^err ::/,                   :color => :red,     :match_level => 0, :priority => -10, :exit => 1},
+      { :match => /^ERROR:/,                   :color => :red,                        :priority => -10, :exit => 1},
       { :match => /.*/,                        :color => :blue,    :match_level => 0, :priority => -20 },
 
       # CLEANUP
@@ -136,8 +136,8 @@ module LeapCli
       { :match => /^warning:/,                     :level => 0, :color => :yellow, :priority => -20},
       { :match => /^Duplicate declaration:/,       :level => 0, :color => :red,    :priority => -20},
       { :match => /Finished catalog run/,          :level => 0, :color => :green,  :priority => -10},
-      { :match => /^Puppet apply complete \(changes made\)/, :level => 0, :color => :green,  :priority => -10},
-      { :match => /^Puppet apply complete \(no changes\)/, :level => 0, :color => :green,  :priority => -10},
+      { :match => /^APPLY COMPLETE \(changes made\)/, :level => 0, :color => :green,  :priority => -10},
+      { :match => /^APPLY COMPLETE \(no changes\)/, :level => 0, :color => :green,  :priority => -10},
 
       # PUPPET FATAL ERRORS
       { :match => /^err:/,                         :level => 0, :color => :red, :priority => -1, :exit => 1},
@@ -146,7 +146,7 @@ module LeapCli
       { :match => /^Syntax error/,                 :level => 0, :color => :red, :priority => -1, :exit => 1},
       { :match => /^Cannot reassign variable/,     :level => 0, :color => :red, :priority => -1, :exit => 1},
       { :match => /^Could not find template/,      :level => 0, :color => :red, :priority => -1, :exit => 1},
-      { :match => /^Puppet apply complete.*fail/,  :level => 0, :color => :red, :priority => -1, :exit => 1},
+      { :match => /^APPLY COMPLETE.*fail/,         :level => 0, :color => :red, :priority => -1, :exit => 1},
 
       # TESTS
       { :match => /^PASS: /,                :color => :green,   :priority => -20},

data/lib/leap_cli/remote/leap_plugin.rb

@@ -6,6 +6,10 @@
 module LeapCli; module Remote; module LeapPlugin
 
   def required_packages
+    "puppet rsync lsb-release locales"
+  end
+
+  def required_wheezy_packages
     "puppet ruby-hiera-puppet rsync lsb-release locales"
   end
 
@@ -60,6 +64,13 @@ module LeapCli; module Remote; module LeapPlugin
     run "touch #{Leap::Platform.init_path}"
   end
 
+  #
+  # dumps the recent deploy history to the console
+  #
+  def history
+    run "(test -s /var/log/leap/deploy-summary.log && tail /var/log/leap/deploy-summary.log) || (test -s /var/log/leap/deploy-summary.log.1 && tail /var/log/leap/deploy-summary.log.1) || (echo 'no history')"
+  end
+
   #
   # This is a hairy ugly hack, exactly the kind of stuff that makes ruby
   # dangerous and too much fun for its own good.

data/lib/leap_cli/remote/puppet_plugin.rb

@@ -18,7 +18,7 @@ module LeapCli; module Remote; module PuppetPlugin
       elsif item[1] === true
         str << "--" + item[0].to_s
       else
-        str << "--" + item[0].to_s + " " + item[1].to_s
+        str << "--" + item[0].to_s + " " + item[1].inspect
       end
     }.join(' ')
   end

data/lib/leap_cli/remote/tasks.rb

@@ -34,10 +34,11 @@ BAD_APT_GET_UPDATE = /(BADSIG|NO_PUBKEY|KEYEXPIRED|REVKEYSIG|NODATA)/
 
 task :install_prerequisites, :max_hosts => MAX_HOSTS do
   apt_get = "DEBIAN_FRONTEND=noninteractive apt-get -q -y -o DPkg::Options::=--force-confold"
+  apt_get_update = "apt-get update -o Acquire::Languages=none"
   leap.mkdirs Leap::Platform.leap_dir
   run "echo 'en_US.UTF-8 UTF-8' > /etc/locale.gen"
   leap.log :updating, "package list" do
-    run "apt-get update" do |channel, stream, data|
+    run apt_get_update do |channel, stream, data|
       # sadly exitcode is unreliable measure if apt-get update hit a failure.
       if data =~ BAD_APT_GET_UPDATE
         LeapCli::Util.bail! do
@@ -57,7 +58,7 @@ task :install_prerequisites, :max_hosts => MAX_HOSTS do
     run "( test -f /etc/init.d/ntp && /etc/init.d/ntp start ) || true"
   end
   leap.log :installing, "required packages" do
-    run "#{apt_get} install #{leap.required_packages}"
+    run %[#{apt_get} install #{leap.required_wheezy_packages}]
   end
   #run "locale-gen"
   leap.mkdirs("/etc/leap", "/srv/leap")

data/lib/leap_cli/util.rb

@@ -97,6 +97,23 @@ module LeapCli
       return output
     end
 
+    def assert_config!(conf_path)
+      value = nil
+      begin
+        value = manager.instance_eval(conf_path)
+      #rescue NoMethodError
+      #rescue NameError
+      ensure
+        assert! !value.nil? && value != "REQUIRED" do
+          log :missing, "required configuration value for #{conf_path}"
+        end
+      end
+    end
+
+    ##
+    ## FILES AND DIRECTORIES
+    ##
+
     def assert_files_missing!(*files)
       options = files.last.is_a?(Hash) ? files.pop : {}
       base = options[:base] || Path.provider
@@ -117,19 +134,6 @@ module LeapCli
       end
     end
 
-    def assert_config!(conf_path)
-      value = nil
-      begin
-        value = manager.instance_eval(conf_path)
-      #rescue NoMethodError
-      #rescue NameError
-      ensure
-        assert! !value.nil? && value != "REQUIRED" do
-          log :missing, "required configuration value for #{conf_path}"
-        end
-      end
-    end
-
     def assert_files_exist!(*files)
       options = files.last.is_a?(Hash) ? files.pop : {}
       file_list = files.collect { |file_path|
@@ -149,6 +153,7 @@ module LeapCli
       end
     end
 
+    # takes a list of symbolic paths. returns true if all files exist or are directories.
     def file_exists?(*files)
       files.each do |file_path|
         file_path = Path.named_path(file_path)
@@ -159,9 +164,16 @@ module LeapCli
       return true
     end
 
-    ##
-    ## FILES AND DIRECTORIES
-    ##
+    # takes a list of symbolic paths. returns true if all are directories.
+    def dir_exists?(*dirs)
+      dirs.each do |dir_path|
+        dir_path = Path.named_path(dir_path)
+        if !Dir.exists?(dir_path)
+          return false
+        end
+      end
+      return true
+    end
 
     #
     # creates a directory if it doesn't already exist
@@ -343,16 +355,12 @@ module LeapCli
     end
 
     #
-    # compares md5 fingerprints to see if the contents of a file match the string we have in memory
+    # compares md5 fingerprints to see if the contents of a file match the
+    # string we have in memory
     #
     def file_content_equals?(filepath, contents)
       filepath = Path.named_path(filepath)
-      output = `md5sum '#{filepath}'`.strip
-      if $?.to_i == 0
-        return output.split(" ").first == Digest::MD5.hexdigest(contents).to_s
-      else
-        return false
-      end
+      Digest::MD5.file(filepath).hexdigest == Digest::MD5.hexdigest(contents)
     end
 
     ##

data/lib/leap_cli/util/secret.rb

@@ -8,7 +8,7 @@ autoload :OpenSSL, 'openssl'
 
 module LeapCli; module Util
   class Secret
-    CHARS = ('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a + "_".split(//u) - "io01lO".split(//u)
+    CHARS = (('A'..'Z').to_a + ('a'..'z').to_a + ('0'..'9').to_a) - "i1loO06G".split(//u)
     HEX = (0..9).to_a + ('a'..'f').to_a
 
     #