beam_up 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 55ab9d14c6fe9bb0bdb38f023f1242f174b538b117c5d0f95fabe6231ad6f745
-  data.tar.gz: 3859429f3775c52781da38cf040ae2cbd4d246a7062255cd0aaee0dd79a8e0c9
+  metadata.gz: b10eded0c9811a845155eaaa6a83ccfc37d958ce58e59ec30a3b022f8fbc13b6
+  data.tar.gz: adc80ce6a37bf79bc0db5d055c574ab114968d8049eb3a7b9a27cf09596c0fda
 SHA512:
-  metadata.gz: 5f4e221e74c4661c0df1cc5d1287ee69bb6e025762fd8a9e4df1e4739629219195e547cc7742e1b9420ac35d15fcb0208f060f5541a535198bc9eba9fdfb4530
-  data.tar.gz: 4e51baca30f01370cdd292fd3f4ee0bd47dbb67c4800c7416f1b52a644bcd08a535afd0587cd075ccc7180c0fddba2c50c09789d71e37624c00e7bfa1e8bc8da
+  metadata.gz: 33588c7eca1e972fcb51ee9d0fa5356920d1551a0d16ba73498551b74dd3c6c6fbbdb164b8de7e15e95270d9950ed418ae50c68372b7fe70dacd378e3fad1645
+  data.tar.gz: aa8624dc95de22e7ad7e915b78c0cb9b994d7f5920723c4d24d0e1cf63b08bf03ad54d345dbfb3ace3af794d97d317b93e6762be3beb773e4bcf4b15a194607a

data/lib/beam_up/cli.rb

@@ -10,6 +10,7 @@ module BeamUp
     def initialize(arguments)
       @arguments = arguments
       @provider = nil
+      @config_file = nil
     end
 
     def run
@@ -81,7 +82,7 @@ module BeamUp
     def deploy
       input = parse_options
 
-      beamed = BeamUp.deploy! input, provider: @provider
+      beamed = BeamUp.deploy! input, provider: @provider, config_file: @config_file
 
       puts beamed.message
       puts "Deploy ID: #{beamed.deploy_id}" if beamed.deploy_id
@@ -150,11 +151,13 @@ module BeamUp
           beam_up [FOLDER]                      # Deploy using .beam_up.yml config
           beam_up [FOLDER] --to PROVIDER        # Deploy with provider override
           beam_up [FOLDER] --provider PROVIDER  # Alias for --to
+          beam_up [FOLDER] --config FILE        # Use a specific config file
 
         Examples:
           beam_up init netlify
           beam_up ./output
           beam_up ./output --to aws_s3
+          beam_up ./output --config /path/to/config.yml
       HELP
 
       exit
@@ -174,6 +177,10 @@ module BeamUp
           @provider = value
         end
 
+        options.on("--config FILE", "Use a specific config file") do |value|
+          @config_file = value
+        end
+
         options.on("--help", "-h", "Show this help") do
           help
 

data/lib/beam_up/configuration.rb

@@ -2,7 +2,7 @@
 
 module BeamUp
   class Configuration
-    attr_accessor :provider, :path, :before_actions, :after_actions, :timeout
+    attr_accessor :provider, :path, :before_actions, :after_actions, :timeout, :config_file
 
     DEFAULT_TIMEOUT = 300  # 5 minutes
 

data/lib/beam_up/core.rb

@@ -5,16 +5,23 @@ require "yaml"
 module BeamUp
   class Core
     class << self
-      def configure
+      def configure(&block)
         yield(configuration)
       end
 
-      def configuration
-        @configuration ||= configuration_file || raise(ConfigurationError, "No .beam_up.yml found. Run `beam_up init PROVIDER` to create one.")
+      attr_writer :config_file
+
+      def configuration(config_file: nil)
+        @configuration ||= begin
+          custom_path = config_file || @config_file || ((@configuration&.config_file && File.exist?(@configuration.config_file)) ? @configuration.config_file : nil)
+          config = custom_path ? configuration_file(custom_path) : configuration_file
+
+          config || raise(ConfigurationError, "No .beam_up.yml found. Run `beam_up init PROVIDER` to create one.")
+        end
       end
 
-      def deploy!(path = nil, provider: nil)
-        config = configuration_file
+      def deploy!(path = nil, provider: nil, config_file: nil)
+        config = configuration(config_file: config_file)
         config.provider = provider if provider
 
         deploy_path = path || config.path || raise(ConfigurationError, "No path specified")
@@ -33,9 +40,10 @@ module BeamUp
 
       private
 
-      def configuration_file
-        file = ["config/beam_up.yml", ".beam_up.yml"].find { File.exist?(it) }
-        return nil unless file
+      def configuration_file(custom_path = nil)
+        file = custom_path || ["config/beam_up.yml", ".beam_up.yml"].find { File.exist?(it) }
+
+        return nil unless file && File.exist?(file)
 
         data = YAML.safe_load_file(file)
 

data/lib/beam_up/version.rb

@@ -1,3 +1,3 @@
 module BeamUp
-  VERSION = "0.5.0"
+  VERSION = "0.6.0"
 end

data/lib/beam_up.rb

@@ -24,8 +24,12 @@ module BeamUp
   class << self
     def configure(&block) = Core.configure(&block)
 
-    def configuration = Core.configuration
+    def config_file=(path)
+      Core.config_file = path
+    end
 
-    def deploy!(path = nil, provider: nil, to: nil) = Core.deploy!(path, provider: (to || provider)&.to_s)
+    def configuration(config_file: nil) = Core.configuration(config_file: config_file)
+
+    def deploy!(path = nil, provider: nil, to: nil, config_file: nil) = Core.deploy!(path, provider: (to || provider)&.to_s, config_file: config_file)
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: beam_up
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Rails Designer