broadside 2.0.0 → 3.0.0.pre.prerelease

data/lib/broadside/version.rb

@@ -1,3 +1,3 @@
 module Broadside
-  VERSION = '2.0.0'
+  VERSION = '3.0.0-prerelease'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: broadside
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 3.0.0.pre.prerelease
 platform: ruby
 authors:
 - Matthew Leung
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -31,6 +31,26 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '5'
+- !ruby/object:Gem::Dependency
+  name: activemodel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '3'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +72,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -59,6 +82,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.9.0
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
@@ -74,19 +100,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.13'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: tty
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.1'
+        version: '0.5'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -115,20 +141,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.9'
-- !ruby/object:Gem::Dependency
-  name: fakefs
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 description: 
 email:
 - leung.mattp@gmail.com
@@ -139,7 +151,9 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".gitmodules"
+- ".hound.yml"
 - ".rspec"
+- ".rubocop.yml"
 - ".travis.yml"
 - AUTHORS
 - CHANGELOG.md
@@ -149,17 +163,18 @@ files:
 - bin/broadside
 - broadside.gemspec
 - lib/broadside.rb
-- lib/broadside/configuration.rb
-- lib/broadside/configuration/aws_config.rb
-- lib/broadside/configuration/ecs_config.rb
-- lib/broadside/configuration/verify_instance_variables.rb
+- lib/broadside/command.rb
+- lib/broadside/configuration/aws_configuration.rb
+- lib/broadside/configuration/configuration.rb
+- lib/broadside/configuration/invalid_configuration.rb
 - lib/broadside/deploy.rb
 - lib/broadside/ecs/ecs_deploy.rb
 - lib/broadside/ecs/ecs_manager.rb
 - lib/broadside/error.rb
-- lib/broadside/predeploy_commands.rb
+- lib/broadside/gli/commands.rb
+- lib/broadside/gli/global.rb
+- lib/broadside/logging_utils.rb
 - lib/broadside/target.rb
-- lib/broadside/utils.rb
 - lib/broadside/version.rb
 homepage: https://github.com/lumoslabs/broadside
 licenses:
@@ -176,12 +191,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.5
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: A command-line tool for EC2 Container Service deployment.

data/lib/broadside/configuration.rb

@@ -1,58 +0,0 @@
-require 'logger'
-
-module Broadside
-  class Configuration
-    extend Gem::Deprecate
-    include VerifyInstanceVariables
-    include Utils
-
-    attr_accessor(
-      :application,
-      :docker_image,
-      :file,
-      :git_repo,
-      :logger,
-      :prehook,
-      :posthook,
-      :ssh,
-      :timeout,
-      :type
-    )
-    attr_reader :targets
-
-    def initialize
-      @logger = ::Logger.new(STDOUT)
-      @logger.level = ::Logger::DEBUG
-      @logger.datetime_format = '%Y-%m-%d_%H:%M:%S'
-      @timeout = 600
-    end
-
-    def aws
-      @aws ||= AwsConfig.new
-    end
-
-    def ecs
-      @ecs ||= EcsConfig.new
-    end
-
-    def targets=(_targets)
-      raise ArgumentError, "Targets must be a hash" unless _targets.is_a?(Hash)
-      @targets = _targets.map { |name, config| Target.new(name, config) }
-    end
-
-    def verify(*args)
-      super(*([:application, :docker_image] + args))
-    end
-
-    # Maintain backward compatibility
-    def deploy
-      self
-    end
-    deprecate :deploy, 'config.deploy.option should be configured directly as config.option', 2017, 4
-
-    def base
-      self
-    end
-    deprecate :base, 'config.base.option should be configured directly as config.option', 2017, 4
-  end
-end

data/lib/broadside/configuration/aws_config.rb

@@ -1,14 +0,0 @@
-require 'aws-sdk'
-
-module Broadside
-  class AwsConfig
-    include VerifyInstanceVariables
-
-    attr_accessor :region, :credentials
-
-    def initialize
-      @region = 'us-east-1'
-      @credentials = Aws::SharedCredentials.new.credentials
-    end
-  end
-end

data/lib/broadside/configuration/ecs_config.rb

@@ -1,13 +0,0 @@
-module Broadside
-  class EcsConfig
-    include VerifyInstanceVariables
-
-    # Cluster can be overridden in a Target
-    attr_accessor :cluster, :poll_frequency
-
-    def initialize
-      @cluster = nil
-      @poll_frequency = 2
-    end
-  end
-end

data/lib/broadside/configuration/verify_instance_variables.rb

@@ -1,11 +0,0 @@
-module Broadside
-  module VerifyInstanceVariables
-    def verify(*args)
-      args.each do |var|
-        if self.send(var).nil?
-          raise Broadside::MissingVariableError, "Missing required #{self.class.to_s.split("::").last} variable '#{var}' !"
-        end
-      end
-    end
-  end
-end

data/lib/broadside/predeploy_commands.rb

@@ -1,7 +0,0 @@
-# Here rest some commonly used predeploy commands, so they can be included by constant name instead of
-# having to retype them in every config file.
-module Broadside
-  module PredeployCommands
-    RAKE_DB_MIGRATE = ['bundle', 'exec', 'rake', '--trace', 'db:migrate']
-  end
-end

data/lib/broadside/utils.rb

@@ -1,27 +0,0 @@
-module Broadside
-  module Utils
-    def debug(*args)
-      config.logger.debug(args.join(' '))
-    end
-
-    def info(*args)
-      config.logger.info(args.join(' '))
-    end
-
-    def warn(*args)
-      config.logger.warn(args.join(' '))
-    end
-
-    def error(*args)
-      config.logger.error(args.join(' '))
-    end
-
-    def exception(*args)
-      raise Broadside::Error, args.join("\n")
-    end
-
-    def config
-      Broadside.config
-    end
-  end
-end