envirobly 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4069ab1f0da67a7bc06444c1d32cef454c23924f125925f1bc00bcd56419b94f
-  data.tar.gz: e5f5628338e7b9deda59a6c26f6e95b967f8ecbbfa0a1b41994aa3834f92a77a
+  metadata.gz: 58cece10b3dc2908e0bce6a78f509463c8261fa34d54c9a45059b95205c494d3
+  data.tar.gz: 71b06913da6f29967a5f779c62a76423f30242474daeda744b34be44f7ba494a
 SHA512:
-  metadata.gz: de515ea959bef33ba5a1e89ffa6862d3a8f116a8f4cab2249b97042e7a92e19020daeba4c5a93babbee793656f1f34b86850924cf97cb22b17f0a739333de4a1
-  data.tar.gz: af5c4e4b6d08d1c08a06be9089a9e0f0d790915efafbf0cf0694a0e0ff90c68fbfdebdcb78c2921a3f7dd571561132968839832c0c5c5cb8be7a5b13b59afba0
+  metadata.gz: d67d5afc046a25396f822f86d17d584172468e277ff5626efbb1d11fadffdad86e821118b2d8dc0ee89f33b9d316d999fce182f5001be7e7029977aeb3a9604c
+  data.tar.gz: 224f58f13842244a423fbef3ab69540a97969a15c168e09a090f8a8c255340ec65657db6bf680d6c384d2dbda804d51708dc2bc99928ac03785495e00341837f

data/lib/envirobly/access_token.rb

@@ -69,7 +69,7 @@ class Envirobly::AccessToken
         exit
       end
 
-      api = Envirobly::Api.new(access_token: self)
+      api = Envirobly::Api.new(access_token: self, exit_on_error: false)
 
       # TODO: Eventually replace with custom `whoami` API that returns name, email...
       if api.list_accounts.success?

data/lib/envirobly/api.rb

@@ -8,7 +8,8 @@ class Envirobly::Api
   USER_AGENT = "Envirobly CLI v#{Envirobly::VERSION}"
   CONTENT_TYPE = "application/json"
 
-  def initialize(access_token: Envirobly::AccessToken.new)
+  def initialize(access_token: Envirobly::AccessToken.new, exit_on_error: true)
+    @exit_on_error = exit_on_error
     @access_token = access_token
   end
 
@@ -117,11 +118,18 @@ class Envirobly::Api
       http.request(request).tap do |response|
         def response.object
           @json_parsed_body ||= JSON.parse(body)
+        rescue
+          @json_parsed_body = { error_message: body }
         end
 
         def response.success?
           (200..299).include?(code.to_i)
         end
+
+        if @exit_on_error && !response.success? && response.object[:error_message].present?
+          puts response.object[:error_message] # TODO: Replace with shell.say_error
+          exit 1
+        end
       end
     end
 

data/lib/envirobly/cli/main.rb

@@ -80,7 +80,8 @@ class Envirobly::Cli::Main < Envirobly::Base
   TXT
   method_option :account_id, type: :numeric
   method_option :region, type: :string
-  method_option :project, type: :string
+  method_option :project_id, type: :numeric
+  method_option :project_name, type: :string
   method_option :commit, type: :string, default: "HEAD"
   method_option :dry_run, type: :boolean, default: false
   def deploy(environ_name = nil)
@@ -93,31 +94,19 @@ class Envirobly::Cli::Main < Envirobly::Base
 
     Envirobly::AccessToken.new(shell:).require!
 
-    environ_name = environ_name.presence || commit.current_branch
-    project_name = nil
-    project_id = nil
-
-    if options.project.present?
-      if options.project =~ Envirobly::Defaults::Project.regexp
-        project_id = $1.to_i
-      else
-        project_name = options.project
-      end
-    end
-
     deployment = Envirobly::Deployment.new(
       account_id: options.account_id,
       region: options.region,
-      project_name:,
-      environ_name:,
-      project_id:,
+      project_id: options.project_id,
+      project_name: options.project_name,
+      environ_name: environ_name.presence || commit.current_branch,
       commit:,
       shell:
     )
     deployment.perform(dry_run: options.dry_run)
   end
 
-  desc "pull", "Download build context"
+  desc "pull [REGION] [BUCKET] [REF] [PATH]", "Download build context. Used by Envirobly builders."
   def pull(region, bucket, ref, path)
     Envirobly::Duration.measure("Build context download took %s") do
       s3 = Envirobly::Aws::S3.new(region:, bucket:)

data/lib/envirobly/version.rb

@@ -1,3 +1,3 @@
 module Envirobly
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: envirobly
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Robert Starsi