leap_cli 1.8.1 → 1.9

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: leap_cli
 version: !ruby/object:Gem::Version
-  version: 1.8.1
+  version: '1.9'
 platform: ruby
 authors:
 - LEAP Encryption Access Project
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-01 00:00:00.000000000 Z
+date: 2016-10-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -45,75 +59,53 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 2.12.0
 - !ruby/object:Gem::Dependency
-  name: command_line_reporter
+  name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.3'
+        version: '1.11'
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: fog-aws
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.11'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0.11'
 - !ruby/object:Gem::Dependency
-  name: paint
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.9'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.9'
-- !ruby/object:Gem::Dependency
-  name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.7'
+        version: 0.9.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.7'
-- !ruby/object:Gem::Dependency
-  name: capistrano
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.15'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+        version: '0.9'
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: 0.9.1
 - !ruby/object:Gem::Dependency
   name: ya2yaml
   requirement: !ruby/object:Gem::Requirement
@@ -142,40 +134,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-- !ruby/object:Gem::Dependency
-  name: base32
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.3'
-- !ruby/object:Gem::Dependency
-  name: activemodel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.0'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.0.6
 description: The command "leap" can be used to manage a bevy of servers running the
   LEAP platform from the comfort of your own home.
 email: root@leap.se
@@ -185,22 +143,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/leap
-- lib/leap/platform.rb
 - lib/leap_cli.rb
 - lib/leap_cli/bootstrap.rb
 - lib/leap_cli/commands/common.rb
 - lib/leap_cli/commands/new.rb
 - lib/leap_cli/commands/pre.rb
-- lib/leap_cli/config/environment.rb
-- lib/leap_cli/config/filter.rb
-- lib/leap_cli/config/manager.rb
-- lib/leap_cli/config/node.rb
-- lib/leap_cli/config/object.rb
-- lib/leap_cli/config/object_list.rb
-- lib/leap_cli/config/provider.rb
-- lib/leap_cli/config/secrets.rb
-- lib/leap_cli/config/sources.rb
-- lib/leap_cli/config/tag.rb
 - lib/leap_cli/core_ext/boolean.rb
 - lib/leap_cli/core_ext/deep_dup.rb
 - lib/leap_cli/core_ext/hash.rb
@@ -211,27 +158,36 @@ files:
 - lib/leap_cli/core_ext/yaml.rb
 - lib/leap_cli/exceptions.rb
 - lib/leap_cli/leapfile.rb
-- lib/leap_cli/lib_ext/capistrano_connections.rb
 - lib/leap_cli/lib_ext/gli.rb
 - lib/leap_cli/load_paths.rb
 - lib/leap_cli/log.rb
-- lib/leap_cli/logger.rb
 - lib/leap_cli/markdown_document_listener.rb
 - lib/leap_cli/override/json.rb
 - lib/leap_cli/path.rb
-- lib/leap_cli/remote/leap_plugin.rb
-- lib/leap_cli/remote/puppet_plugin.rb
-- lib/leap_cli/remote/rsync_plugin.rb
-- lib/leap_cli/remote/tasks.rb
-- lib/leap_cli/ssh_key.rb
 - lib/leap_cli/util.rb
-- lib/leap_cli/util/remote_command.rb
-- lib/leap_cli/util/secret.rb
-- lib/leap_cli/util/x509.rb
 - lib/leap_cli/version.rb
+- vendor/acme-client/lib/acme-client.rb
+- vendor/acme-client/lib/acme/client.rb
+- vendor/acme-client/lib/acme/client/certificate.rb
+- vendor/acme-client/lib/acme/client/certificate_request.rb
+- vendor/acme-client/lib/acme/client/crypto.rb
+- vendor/acme-client/lib/acme/client/error.rb
+- vendor/acme-client/lib/acme/client/faraday_middleware.rb
+- vendor/acme-client/lib/acme/client/resources.rb
+- vendor/acme-client/lib/acme/client/resources/authorization.rb
+- vendor/acme-client/lib/acme/client/resources/challenges.rb
+- vendor/acme-client/lib/acme/client/resources/challenges/base.rb
+- vendor/acme-client/lib/acme/client/resources/challenges/dns01.rb
+- vendor/acme-client/lib/acme/client/resources/challenges/http01.rb
+- vendor/acme-client/lib/acme/client/resources/challenges/tls_sni01.rb
+- vendor/acme-client/lib/acme/client/resources/registration.rb
+- vendor/acme-client/lib/acme/client/self_sign_certificate.rb
+- vendor/acme-client/lib/acme/client/version.rb
+- vendor/base32/lib/base32.rb
 - vendor/certificate_authority/lib/certificate_authority.rb
 - vendor/certificate_authority/lib/certificate_authority/certificate.rb
 - vendor/certificate_authority/lib/certificate_authority/certificate_revocation_list.rb
+- vendor/certificate_authority/lib/certificate_authority/core_extensions.rb
 - vendor/certificate_authority/lib/certificate_authority/distinguished_name.rb
 - vendor/certificate_authority/lib/certificate_authority/extensions.rb
 - vendor/certificate_authority/lib/certificate_authority/key_material.rb
@@ -241,6 +197,7 @@ files:
 - vendor/certificate_authority/lib/certificate_authority/serial_number.rb
 - vendor/certificate_authority/lib/certificate_authority/signing_entity.rb
 - vendor/certificate_authority/lib/certificate_authority/signing_request.rb
+- vendor/certificate_authority/lib/certificate_authority/validations.rb
 - vendor/rsync_command/lib/rsync_command.rb
 - vendor/rsync_command/lib/rsync_command/ssh_options.rb
 - vendor/rsync_command/lib/rsync_command/thread_pool.rb
@@ -260,6 +217,8 @@ require_paths:
 - lib
 - vendor/certificate_authority/lib
 - vendor/rsync_command/lib
+- vendor/base32/lib
+- vendor/acme-client/lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="

data/lib/leap/platform.rb

@@ -1,90 +0,0 @@
-module Leap
-
-  class Platform
-    class << self
-      #
-      # configuration
-      #
-
-      attr_reader :version
-      attr_reader :compatible_cli
-      attr_accessor :facts
-      attr_accessor :paths
-      attr_accessor :node_files
-      attr_accessor :monitor_username
-      attr_accessor :reserved_usernames
-
-      attr_accessor :hiera_dir
-      attr_accessor :hiera_path
-      attr_accessor :files_dir
-      attr_accessor :leap_dir
-      attr_accessor :init_path
-
-      attr_accessor :default_puppet_tags
-
-      def define(&block)
-        # some defaults:
-        @reserved_usernames = []
-        @hiera_dir  = '/etc/leap'
-        @hiera_path = '/etc/leap/hiera.yaml'
-        @leap_dir   = '/srv/leap'
-        @files_dir  = '/srv/leap/files'
-        @init_path  = '/srv/leap/initialized'
-        @default_puppet_tags = []
-
-        self.instance_eval(&block)
-
-        @version ||= Gem::Version.new("0.0")
-      end
-
-      def version=(version)
-        @version = Gem::Version.new(version)
-      end
-
-      def compatible_cli=(range)
-        @compatible_cli = range
-        @minimum_cli_version = Gem::Version.new(range.first)
-        @maximum_cli_version = Gem::Version.new(range.last)
-      end
-
-      #
-      # return true if the cli_version is compatible with this platform.
-      #
-      def compatible_with_cli?(cli_version)
-        cli_version = Gem::Version.new(cli_version)
-        cli_version >= @minimum_cli_version && cli_version <= @maximum_cli_version
-      end
-
-      #
-      # return true if the platform version is within the specified range.
-      #
-      def version_in_range?(range)
-        if range.is_a? String
-          range = range.split('..')
-        end
-        minimum_platform_version = Gem::Version.new(range.first)
-        maximum_platform_version = Gem::Version.new(range.last)
-        @version >= minimum_platform_version && @version <= maximum_platform_version
-      end
-
-      def major_version
-        if @version.segments.first == 0
-          @version.segments[0..1].join('.')
-        else
-          @version.segments.first
-        end
-      end
-
-      def method_missing(method, *args)
-        puts
-        puts "WARNING:"
-        puts "  leap_cli is out of date and does not understand `#{method}`."
-        puts "  called from: #{caller.first}"
-        puts "  please upgrade to a newer leap_cli"
-      end
-
-    end
-
-  end
-
-end

data/lib/leap_cli/config/environment.rb

@@ -1,180 +0,0 @@
-#
-# All configurations files can be isolated into separate environments.
-#
-# Each config json in each environment inherits from the default environment,
-# which in term inherits from the "_base_" environment:
-#
-# _base_             -- base provider in leap_platform
-# '- default         -- environment in provider dir when no env is set
-#    '- production   -- example environment
-#
-
-module LeapCli; module Config
-
-  class Environment
-    # the String name of the environment
-    attr_accessor :name
-
-    # the shared Manager object
-    attr_accessor :manager
-
-    # hashes of {name => Config::Object}
-    attr_accessor :services, :tags, :partials
-
-    # a Config::Provider
-    attr_accessor :provider
-
-    # a Config::Object
-    attr_accessor :common
-
-    # shared, non-inheritable
-    def nodes; @@nodes; end
-    def secrets; @@secrets; end
-
-    def initialize(manager, name, search_dir, parent, options={})
-      @@nodes ||= nil
-      @@secrets ||= nil
-
-      @manager = manager
-      @name    = name
-
-      load_provider_files(search_dir, options)
-
-      if parent
-        @services.inherit_from! parent.services, self
-            @tags.inherit_from! parent.tags    , self
-        @partials.inherit_from! parent.partials, self
-          @common.inherit_from! parent.common
-        @provider.inherit_from! parent.provider
-      end
-
-      if @provider
-        @provider.set_env(name)
-        @provider.validate!
-      end
-    end
-
-    def load_provider_files(search_dir, options)
-      #
-      # load empty environment if search_dir doesn't exist
-      #
-      if search_dir.nil? || !Dir.exist?(search_dir)
-        @services = Config::ObjectList.new
-        @tags     = Config::ObjectList.new
-        @partials = Config::ObjectList.new
-        @provider = Config::Provider.new
-        @common   = Config::Object.new
-        return
-      end
-
-      #
-      # inheritable
-      #
-      if options[:scope]
-        scope = options[:scope]
-        @services = load_all_json(Path.named_path([:service_env_config, '*', scope],  search_dir), Config::Tag, options)
-        @tags     = load_all_json(Path.named_path([:tag_env_config, '*', scope],      search_dir), Config::Tag, options)
-        @partials = load_all_json(Path.named_path([:service_env_config, '_*', scope], search_dir), Config::Tag, options)
-        @provider = load_json(    Path.named_path([:provider_env_config, scope],      search_dir), Config::Provider, options)
-        @common   = load_json(    Path.named_path([:common_env_config, scope],        search_dir), Config::Object, options)
-      else
-        @services = load_all_json(Path.named_path([:service_config, '*'],  search_dir), Config::Tag, options)
-        @tags     = load_all_json(Path.named_path([:tag_config, '*'],      search_dir), Config::Tag, options)
-        @partials = load_all_json(Path.named_path([:service_config, '_*'], search_dir), Config::Tag, options)
-        @provider = load_json(    Path.named_path(:provider_config,        search_dir), Config::Provider, options)
-        @common   = load_json(    Path.named_path(:common_config,          search_dir), Config::Object, options)
-      end
-
-      # remove 'name' from partials, since partials get merged with nodes
-      @partials.values.each {|partial| partial.delete('name'); }
-
-      #
-      # shared: currently non-inheritable
-      # load the first ones we find, and only those.
-      #
-      if @@nodes.nil? || @@nodes.empty?
-        @@nodes = load_all_json(Path.named_path([:node_config, '*'], search_dir), Config::Node, options)
-      end
-      if @@secrets.nil? || @@secrets.empty?
-        @@secrets = load_json(Path.named_path(:secrets_config, search_dir), Config::Secrets, options)
-      end
-    end
-
-    #
-    # Loads a json template file as a Hash (used only when creating a new node .json
-    # file for the first time).
-    #
-    def template(template)
-      path = Path.named_path([:template_config, template], Path.provider_base)
-      if File.exists?(path)
-        return load_json(path, Config::Object)
-      else
-        return nil
-      end
-    end
-
-    private
-
-    def load_all_json(pattern, object_class, options={})
-      results = Config::ObjectList.new
-      Dir.glob(pattern).each do |filename|
-        next if options[:no_dots] && File.basename(filename) !~ /^[^\.]*\.json$/
-        obj = load_json(filename, object_class)
-        if obj
-          name = File.basename(filename).force_encoding('utf-8').sub(/^([^\.]+).*\.json$/,'\1')
-          obj['name'] ||= name
-          if options[:env]
-            obj.environment = options[:env]
-          end
-          results[name] = obj
-        end
-      end
-      results
-    end
-
-    def load_json(filename, object_class, options={})
-      if !File.exists?(filename)
-        return object_class.new(self)
-      end
-
-      Util::log :loading, filename, 3
-
-      #
-      # Read a JSON file, strip out comments.
-      #
-      # UTF8 is the default encoding for JSON, but others are allowed:
-      # https://www.ietf.org/rfc/rfc4627.txt
-      #
-      buffer = StringIO.new
-      File.open(filename, "rb", :encoding => 'UTF-8') do |f|
-        while (line = f.gets)
-          next if line =~ /^\s*\/\//
-          buffer << line
-        end
-      end
-
-      #
-      # force UTF-8
-      #
-      if $ruby_version >= [1,9]
-        string = buffer.string.force_encoding('utf-8')
-      else
-        string = Iconv.conv("UTF-8//IGNORE", "UTF-8", buffer.string)
-      end
-
-      # parse json
-      begin
-        hash = JSON.parse(string, :object_class => Hash, :array_class => Array) || {}
-      rescue SyntaxError, JSON::ParserError => exc
-        Util::log 0, :error, 'in file "%s":' % filename
-        Util::log 0, exc.to_s, :indent => 1
-        return nil
-      end
-      object = object_class.new(self)
-      object.deep_merge!(hash)
-      return object
-    end
-
-  end # end Environment
-
-end; end