leap_cli 1.7.4 → 1.8

data/lib/leap_cli/config/node.rb

@@ -9,8 +9,8 @@ module LeapCli; module Config
   class Node < Object
     attr_accessor :file_paths
 
-    def initialize(manager=nil)
-      super(manager)
+    def initialize(environment=nil)
+      super(environment)
       @node = self
       @file_paths = []
     end

data/lib/leap_cli/config/object.rb

@@ -11,33 +11,6 @@ require 'ya2yaml' # pure ruby yaml
 module LeapCli
   module Config
 
-    #
-    # A proxy for Manager that binds to a particular object
-    # (so that we can bind to a particular environment)
-    #
-    class ManagerBinding
-      def initialize(manager, object)
-        @manager = manager
-        @object = object
-      end
-
-      def services
-        @manager.env(@object.environment).services
-      end
-
-      def tags
-        @manager.env(@object.environment).tags
-      end
-
-      def provider
-        @manager.env(@object.environment).provider
-      end
-
-      def method_missing(*args)
-        @manager.send(*args)
-      end
-    end
-
     #
     # This class represents the configuration for a single node, service, or tag.
     # Also, all the nested hashes are also of this type.
@@ -46,21 +19,27 @@ module LeapCli
     #
     class Object < Hash
 
+      attr_reader :env
       attr_reader :node
 
-      def initialize(manager=nil, node=nil)
-        # keep a global pointer around to the config manager. used a lot in the eval strings and templates
-        # (which are evaluated in the context of Config::Object)
-        @manager = manager
-
-        # an object that is a node as @node equal to self, otherwise all the child objects point back to the top level node.
+      def initialize(environment=nil, node=nil)
+        raise ArgumentError unless environment.nil? || environment.is_a?(Config::Environment)
+        @env = environment
+        # an object that is a node as @node equal to self, otherwise all the
+        # child objects point back to the top level node.
         @node = node || self
       end
 
       def manager
-        ManagerBinding.new(@manager, self)
+        @env.manager
+      end
+
+      #
+      # TODO: deprecate node.global()
+      #
+      def global
+        @env
       end
-      alias :global :manager
 
       def environment=(e)
         self.store('environment', e)
@@ -70,6 +49,11 @@ module LeapCli
         self['environment']
       end
 
+      def duplicate(env)
+        new_object = self.deep_dup
+        new_object.set_environment(env, new_object)
+      end
+
       #
       # export YAML
       #
@@ -85,12 +69,23 @@ module LeapCli
       #
       # export JSON
       #
-      def dump_json(*options)
+      def dump_json(options={})
         evaluate(@node)
-        if options.include? :compact
-          self.to_json
+        if options[:format] == :compact
+          return self.to_json
         else
-          JSON.sorted_generate(self)
+          excluded = {}
+          if options[:exclude]
+            options[:exclude].each do |key|
+              excluded[key] = self[key]
+              self.delete(key)
+            end
+          end
+          json_str = JSON.sorted_generate(self)
+          if excluded.any?
+            self.merge!(excluded)
+          end
+          return json_str
         end
       end
 
@@ -186,6 +181,10 @@ module LeapCli
             mode = :subtract
             old_value = self.fetch '-'+key, nil
             self.delete('-'+key)
+          elsif self.has_key?('!'+key)
+            mode = :replace
+            old_value = self.fetch '!'+key, nil
+            self.delete('!'+key)
           else
             mode = :normal
             old_value = self.fetch key, nil
@@ -197,9 +196,13 @@ module LeapCli
           old_value = true  if old_value == "true"
           old_value = false if old_value == "false"
 
+          # force replace?
+          if mode == :replace && prefer_self
+            value = old_value
+
           # merge hashes
-          if old_value.is_a?(Hash) || new_value.is_a?(Hash)
-            value = Config::Object.new(@manager, @node)
+          elsif old_value.is_a?(Hash) || new_value.is_a?(Hash)
+            value = Config::Object.new(@env, @node)
             old_value.is_a?(Hash) ? value.deep_merge!(old_value) : (value[key] = old_value if !old_value.nil?)
             new_value.is_a?(Hash) ? value.deep_merge!(new_value, prefer_self) : (value[key] = new_value if !new_value.nil?)
 
@@ -250,6 +253,16 @@ module LeapCli
         self
       end
 
+      def set_environment(env, node)
+        @env = env
+        @node = node
+        self.each do |key, value|
+          if value.is_a?(Config::Object)
+            value.set_environment(env, node)
+          end
+        end
+      end
+
       #
       # like a reverse deep merge
       # (self takes precedence)
@@ -286,7 +299,7 @@ module LeapCli
         keys.each do |key|
           obj = fetch_value(key, context)
           if is_required_value_not_set?(obj)
-            Util::log 0, :warning, "required key \"#{key}\" is not set in node \"#{node.name}\"."
+            Util::log 0, :warning, "required property \"#{key}\" is not set in node \"#{node.name}\"."
           elsif obj.is_a? Config::Object
             obj.evaluate_everything(context)
           end
@@ -301,7 +314,7 @@ module LeapCli
           @late_eval_list.each do |key, value|
             self[key] = context.evaluate_ruby(key, value)
             if is_required_value_not_set?(self[key])
-              Util::log 0, :warning, "required key \"#{key}\" is not set in node \"#{node.name}\"."
+              Util::log 0, :warning, "required property \"#{key}\" is not set in node \"#{node.name}\"."
             end
           end
         end

data/lib/leap_cli/config/object_list.rb

@@ -167,14 +167,17 @@ module LeapCli
       end
 
       #
-      # applies inherit_from! to all objects.
+      # Applies inherit_from! to all objects.
       #
-      def inherit_from!(object_list)
+      # 'env' specifies what environment should be for
+      # each object in the list.
+      #
+      def inherit_from!(object_list, env)
         object_list.each do |name, object|
           if self[name]
             self[name].inherit_from!(object)
           else
-            self[name] = object.deep_dup
+            self[name] = object.duplicate(env)
           end
         end
       end

data/lib/leap_cli/config/provider.rb

@@ -4,8 +4,19 @@
 
 module LeapCli; module Config
   class Provider < Object
+    attr_reader :environment
+    def set_env(e)
+      if e == 'default'
+        @environment = nil
+      else
+        @environment = e
+      end
+    end
     def provider
       self
     end
+    def validate!
+      # nothing here yet :(
+    end
   end
 end; end

data/lib/leap_cli/config/secrets.rb

@@ -27,6 +27,15 @@ module LeapCli; module Config
       end
     end
 
+    # searches over all keys matching the regexp, checking to see if the value
+    # has been already used by any of them.
+    def taken?(regexp, value, environment)
+      self.keys.grep(regexp).each do |key|
+        return true if self.retrieve(key, environment) == value
+      end
+      return false
+    end
+
     def set_without_block(key, value, environment)
       set_with_block(key, environment) {value}
     end
@@ -56,7 +65,11 @@ module LeapCli; module Config
       if clean
         self.each_key do |environment|
           if pinned_env.nil? || pinned_env == environment
-            self[environment].each_key do |key|
+            env = self[environment]
+            if env.nil?
+              raise StandardError.new("secrets.json file seems corrupted. No such environment '#{environment}'")
+            end
+            env.each_key do |key|
               unless @discovered_keys[environment] && @discovered_keys[environment][key]
                 self[environment].delete(key)
               end

data/lib/leap_cli/config/tag.rb

@@ -9,8 +9,8 @@ module LeapCli; module Config
   class Tag < Object
     attr_reader :node_list
 
-    def initialize(manager=nil)
-      super(manager)
+    def initialize(environment=nil)
+      super(environment)
       @node_list = Config::ObjectList.new
     end
 

data/lib/leap_cli/leapfile.rb

@@ -16,6 +16,7 @@ module LeapCli
     attr_accessor :leap_version
     attr_accessor :log
     attr_accessor :vagrant_network
+    attr_accessor :vagrant_basebox
     attr_accessor :environment
 
     def initialize

data/lib/leap_cli/log.rb

@@ -83,6 +83,7 @@ module LeapCli
           when :fatal_error then ['fatal error:', :red, :bold]
           when :warning   then ['warning:', :yellow, :bold]
           when :info      then ['info', :cyan, :bold]
+          when :note      then ['NOTE:', :cyan, :bold]
           when :updated   then ['updated', :cyan, :bold]
           when :updating  then ['updating', :cyan, :bold]
           when :created   then ['created', :green, :bold]

data/lib/leap_cli/logger.rb

@@ -113,7 +113,7 @@ module LeapCli
       { :match => /sh: .+: command not found/, :color => :magenta, :match_level => 1, :priority => -30 },
 
       # IMPORTANT
-      { :match => /^err ::/,                   :color => :red,     :match_level => 0, :priority => -10, :exit => 1},
+      { :match => /^(E|e)rr ::/,                   :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 },
 
@@ -129,19 +129,23 @@ module LeapCli
       { :match => /WARNING: The following packages cannot be authenticated!/, :color => :red, :level => 0, :priority => -10},
 
       # PUPPET
-      { :match => /^warning: .*is deprecated.*$/,  :level => 2, :color => :yellow, :priority => -10},
-      { :match => /^warning: Scope.*$/,            :level => 2, :color => :yellow, :priority => -10},
-      { :match => /^notice:/,                      :level => 1, :color => :cyan,   :priority => -20},
-      { :match => /^notice:.*executed successfully$/, :level => 2, :color => :cyan, :priority => -15},
-      { :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 => /^(W|w)arning: Not collecting exported resources without storeconfigs/, :level => 2, :color => :yellow, :priority => -10},
+      { :match => /^(W|w)arning: Found multiple default providers for vcsrepo:/,          :level => 2, :color => :yellow, :priority => -10},
+      { :match => /^(W|w)arning: .*is deprecated.*$/, :level => 2, :color => :yellow, :priority => -10},
+      { :match => /^(W|w)arning: Scope.*$/,           :level => 2, :color => :yellow, :priority => -10},
+      { :match => /^(N|n)otice:/,                     :level => 1, :color => :cyan,   :priority => -20},
+      { :match => /^(N|n)otice:.*executed successfully$/, :level => 2, :color => :cyan, :priority => -15},
+      { :match => /^(W|w)arning:/,                    :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 => /^APPLY COMPLETE \(changes made\)/, :level => 0, :color => :green,  :priority => -10},
-      { :match => /^APPLY COMPLETE \(no changes\)/, :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},
+      { :match => /^(E|e)rr(or|):/,                :level => 0, :color => :red, :priority => -1, :exit => 1},
+      { :match => /^Wrapped exception:/,           :level => 0, :color => :red, :priority => -1, :exit => 1},
       { :match => /^Failed to parse template/,     :level => 0, :color => :red, :priority => -1, :exit => 1},
+      { :match => /^Execution of.*returned/,     :level => 0, :color => :red, :priority => -1, :exit => 1},
       { :match => /^Parameter matches failed:/,    :level => 0, :color => :red, :priority => -1, :exit => 1},
       { :match => /^Syntax error/,                 :level => 0, :color => :red, :priority => -1, :exit => 1},
       { :match => /^Cannot reassign variable/,     :level => 0, :color => :red, :priority => -1, :exit => 1},
@@ -155,8 +159,8 @@ module LeapCli
       { :match => /\d+ tests: \d+ passes, \d+ skips, 0 warnings, 0 failures, 0 errors/, :color => :blue, :priority => -20},
 
       # LOG SUPPRESSION
-      { :match => /^warning: You cannot collect without storeconfigs being set/, :level => 2, :priority => 10},
-      { :match => /^warning: You cannot collect exported resources without storeconfigs being set/, :level => 2, :priority => 10}
+      { :match => /^(W|w)arning: You cannot collect without storeconfigs being set/, :level => 2, :priority => 10},
+      { :match => /^(W|w)arning: You cannot collect exported resources without storeconfigs being set/, :level => 2, :priority => 10}
     ]
 
     def self.sorted_formatters

data/lib/leap_cli/markdown_document_listener.rb

@@ -29,6 +29,8 @@ module LeapCli
     # Gives you the program description
     def program_desc(desc)
       @io.puts "@title = 'Command Line Reference'"
+      @io.puts "@summary = 'A copy of leap --help'"
+
       #@io.puts "# #{File.basename($0)} - #{desc}"
       @io.puts
     end
@@ -98,7 +100,7 @@ module LeapCli
       @commands.push(name)
       #@io.puts "#{@nest}## Command: <tt>#{([name] + aliases).join('|')} #{@arg_name_formatter.format(arg_name,arg_options)}</tt>"
       @io.puts
-      @io.puts "#{@nest}# #{@commands.join ' '} #{@arg_name_formatter.format(arg_name,arg_options)}"
+      @io.puts "#{@nest}# #{@commands.join ' '} #{@arg_name_formatter.format(arg_name, arg_options, [])}"
       @io.puts
       @io.puts String(desc).strip
       @io.puts

data/lib/leap_cli/path.rb

@@ -99,4 +99,16 @@ module LeapCli; module Path
     end
   end
 
+  def self.vagrant_ssh_priv_key_file
+    File.join(LEAP_CLI_BASE_DIR, 'vendor', 'vagrant_ssh_keys', 'vagrant.key')
+  end
+
+  def self.vagrant_ssh_pub_key_file
+    File.join(LEAP_CLI_BASE_DIR, 'vendor', 'vagrant_ssh_keys', 'vagrant.pub')
+  end
+
+  def self.node_init_script
+    File.join(@platform, 'bin', 'node_init')
+  end
+
 end; end

data/lib/leap_cli/remote/leap_plugin.rb

@@ -9,10 +9,6 @@ module LeapCli; module Remote; module LeapPlugin
     "puppet rsync lsb-release locales"
   end
 
-  def required_wheezy_packages
-    "puppet ruby-hiera-puppet rsync lsb-release locales"
-  end
-
   def log(*args, &block)
     LeapCli::Util::log(*args, &block)
   end
@@ -61,15 +57,19 @@ module LeapCli; module Remote; module LeapPlugin
     end
   end
 
-  def mark_initialized
-    run "touch #{Leap::Platform.init_path}"
+  #
+  # dumps debugging information
+  # #
+  def debug
+    run "#{Leap::Platform.leap_dir}/bin/debug.sh"
   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')"
+  def history(lines)
+    command = "(test -s /var/log/leap/deploy-summary.log && tail -n #{lines} /var/log/leap/deploy-summary.log) || (test -s /var/log/leap/deploy-summary.log.1 && tail -n #{lines} /var/log/leap/deploy-summary.log.1) || (echo 'no history')"
+    run command
   end
 
   #
@@ -189,29 +189,4 @@ module LeapCli; module Remote; module LeapPlugin
     STDOUT.flush
   end
 
-  #def mkdir(dir)
-  #  run "mkdir -p #{dir}"
-  #end
-
-  #def chown_root(dir)
-  #  run "chown root -R #{dir} && chmod -R ag-rwx,u+rwX #{dir}"
-  #end
-
-  #def logrun(cmd)
-  #  @streamer ||= LeapCli::Remote::LogStreamer.new
-  #  run cmd do |channel, stream, data|
-  #    @streamer.collect_output(channel[:host], data)
-  #  end
-  #end
-
-#    return_code = nil
-#    run "something; echo return code: $?" do |channel, stream, data|
-#      if data =~ /return code: (\d+)/
-#        return_code = $1.to_i
-#      else
-#        Capistrano::Configuration.default_io_proc.call(channel, stream, data)
-#      end
-#    end
-#    puts "finished with return code: #{return_code}"
-
-end; end; end
+end; end; end

data/lib/leap_cli/remote/puppet_plugin.rb

@@ -24,43 +24,3 @@ module LeapCli; module Remote; module PuppetPlugin
   end
 
 end; end; end
-
-
-    # def puppet(command = :noop)
-    #   #puppet_cmd = "cd #{puppet_destination} && #{sudo_cmd} #{puppet_command} --modulepath=#{puppet_lib} #{puppet_parameters}"
-    #   puppet_cmd = "cd #{puppet_destination} && #{sudo_cmd} #{puppet_command} #{puppet_parameters}"
-    #   flag = command == :noop ? '--noop' : ''
-
-    #   writer = if puppet_stream_output
-    #              SupplyDrop::Writer::Streaming.new(logger)
-    #            else
-    #              SupplyDrop::Writer::Batched.new(logger)
-    #            end
-
-    #   writer = SupplyDrop::Writer::File.new(writer, puppet_write_to_file) unless puppet_write_to_file.nil?
-
-    #   begin
-    #     exitcode = nil
-    #     run "#{puppet_cmd} #{flag}; echo exitcode:$?" do |channel, stream, data|
-    #       if data =~ /exitcode:(\d+)/
-    #         exitcode = $1
-    #         writer.collect_output(channel[:host], "Puppet #{command} complete (#{exitcode_description(exitcode)}).\n")
-    #       else
-    #         writer.collect_output(channel[:host], data)
-    #       end
-    #     end
-    #   ensure
-    #     writer.all_output_collected
-    #   end
-    # end
-
-    # def exitcode_description(code)
-    #   case code
-    #     when "0" then "no changes"
-    #     when "2" then "changes made"
-    #     when "4" then "failed"
-    #     when "6" then "changes and failures"
-    #     else code
-    #   end
-    # end
-