envirobly 1.5.2 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c576e58e00d0c198553f8947987e5e38ee2c4132a84310c84a45d1458b489e
-  data.tar.gz: dc23f2c855310b3497414c19992669d8c78bee44a8c10603f5e0ada101775efa
+  metadata.gz: b171addcd3f154cbcf0707b05cb7957eb181778039fcb8981cfd94b34b5bd8e4
+  data.tar.gz: 41af85c70a1c67e33689dcf94c31550d6dedad8fce6fc9ab8d1fd2cd94d6c617
 SHA512:
-  metadata.gz: f585a7854a3829846b5f86b96d9b6b203a1c032508bfdb4ecd5c522b18055153f7f612cbc7a172576349f2eed3d97e079f64a4921910a411cc4dc971f75f8296
-  data.tar.gz: c0d628c3c80f39a7ec4159b3db1c3bd4d666638bfd013d2464faaf297686e49aa1726929ebe0313e55254d337e1d9bd13132ab92bdf28e111b267d24802876ed
+  metadata.gz: 6d1e5cb4ef14663cba29fa3c45a17b256334fb323e54817d16ba041ccb4d288edbc4e7809d945faf4c278fbbe6562a9914a4b9d4345c18f4785d6d189135b6d5
+  data.tar.gz: e9bb93ab7780128b6c82e3ebe4c29c06f4a7440fa6c3b19ca926f7a86958b52183c33288718f651b8cab980ffb7bc8af78b3d72f7a2fb255b4df9ae1dc5db536

data/lib/envirobly/cli/main.rb

@@ -29,12 +29,12 @@ class Envirobly::Cli::Main < Envirobly::Base
 
   desc "set_default_account", "Choose default account to deploy the current project to"
   def set_default_account
-    Envirobly::Defaults::Account.new(shell:).require_id
+    Envirobly::Defaults::Account.new(shell:).require_value
   end
 
   desc "set_default_region", "Set default region for the current project when deploying for the first time"
   def set_default_region
-    Envirobly::Defaults::Region.new(shell:).require_id
+    Envirobly::Defaults::Region.new(shell:).require_value
   end
 
   desc "validate", "Validates config"

data/lib/envirobly/container_shell.rb

@@ -24,8 +24,8 @@ class Envirobly::ContainerShell
     commit = Envirobly::Git::Commit.new "HEAD"
 
     @params = {
-      account_id: options.account_id || Envirobly::Defaults::Account.new.id,
-      project_name: options.project_name || File.basename(Dir.pwd), # TODO: Extract into Defaults::ProjectName
+      account_id: options.account_id || Envirobly::Defaults::Account.new.value,
+      project_name: options.project_name || Envirobly::Defaults::Project.dirname,
       project_id: options.project_id,
       environ_name: options.environ_name || commit.current_branch,
       service_name: service_name,
@@ -33,7 +33,7 @@ class Envirobly::ContainerShell
     }
 
     if options.project_name.blank? && options.account_id.blank? && options.project_id.blank?
-      @params[:project_id] = Envirobly::Defaults::Project.new.id
+      @params[:project_id] = Envirobly::Defaults::Project.new.value
     end
   end
 

data/lib/envirobly/default.rb

@@ -3,47 +3,36 @@
 class Envirobly::Default
   attr_accessor :shell
 
-  def self.key = "url"
-
   def initialize(shell: nil)
-    @path = File.join Envirobly::Config::DIR, "defaults", self.class.file
+    @path = File.join Envirobly::Config::DIR, "defaults", self.class.name.demodulize.downcase
     @shell = shell
   end
 
-  def id
+  def value
     if File.exist?(@path)
-      content = YAML.safe_load_file(@path)
-
-      if content[self.class.key] =~ self.class.regexp
-        return cast_id($1)
-      end
+      cast_value File.read(@path).strip
+    else
+      nil
     end
-
-    nil
   end
 
-  def save(url)
-    unless url =~ self.class.regexp
-      raise ArgumentError, "'#{url}' must match #{self.class.regexp}"
-    end
-
+  def save(value)
     FileUtils.mkdir_p(File.dirname(@path))
-    content = YAML.dump({ self.class.key => url })
-    File.write(@path, content)
+    File.write(@path, value)
   end
 
-  def save_if_none(url)
-    return if id.present?
+  def save_if_none(new_value)
+    return if value.present?
 
-    save(url)
+    save(new_value)
   end
 
   def require_if_none
-    id || require_id
+    value || require_value
   end
 
   private
-    def cast_id(value)
+    def cast_value(value)
       value.to_i
     end
 end

data/lib/envirobly/defaults/account.rb

@@ -3,10 +3,7 @@
 class Envirobly::Defaults::Account < Envirobly::Default
   include Envirobly::Colorize
 
-  def self.file = "account.yml"
-  def self.regexp = /accounts\/(\d+)/
-
-  def require_id
+  def require_value
     api = Envirobly::Api.new
     accounts = api.list_accounts
 
@@ -15,8 +12,8 @@ class Envirobly::Defaults::Account < Envirobly::Default
       exit 1
     end
 
-    account = accounts.object.first
-    id = account["id"]
+    # If only one account exists, it will be used
+    id = accounts.object.first.fetch("id")
 
     if accounts.object.size > 1
       puts "Choose default account to deploy this project to:"
@@ -34,11 +31,9 @@ class Envirobly::Defaults::Account < Envirobly::Default
         shell.say_error "Cancelled"
         exit
       end
-
-      account = accounts.object.find { |a| a["id"] == id }
     end
 
-    save account["url"]
+    save id
 
     shell.say "Account ##{id} set as project default "
     shell.say green_check

data/lib/envirobly/defaults/project.rb

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 class Envirobly::Defaults::Project < Envirobly::Default
-  def self.file = "project.yml"
-  def self.regexp = /projects\/(\d+)/
+  def self.dirname
+    File.basename(Dir.pwd)
+  end
 end

data/lib/envirobly/defaults/region.rb

@@ -3,11 +3,7 @@
 class Envirobly::Defaults::Region < Envirobly::Default
   include Envirobly::Colorize
 
-  def self.file = "region.yml"
-  def self.regexp = /([a-z0-9\-)]+)/
-  def self.key = "code"
-
-  def require_id
+  def require_value
     api = Envirobly::Api.new
     response = api.list_regions
 
@@ -34,14 +30,14 @@ class Envirobly::Defaults::Region < Envirobly::Default
 
     save code
 
-    shell.say "Region '#{id}' set as project default "
+    shell.say "Region '#{code}' set as project default "
     shell.say green_check
 
-    id
+    code
   end
 
   private
-    def cast_id(value)
-      value
+    def cast_value(value)
+      value.to_s
     end
 end

data/lib/envirobly/deployment.rb

@@ -18,10 +18,10 @@ class Envirobly::Deployment
     end
 
     if project_id.blank? && project_name.blank?
-      project_id = @default_project.id
+      project_id = @default_project.value
 
-      if project_id.nil?
-        project_name = File.basename(Dir.pwd)
+      if project_id.blank?
+        project_name = Envirobly::Defaults::Project.dirname
       end
     end
 
@@ -69,8 +69,8 @@ class Envirobly::Deployment
 
       print "Preparing project..."
 
-      @default_account.save_if_none response.object.fetch("account_url")
-      @default_project.save_if_none response.object.fetch("project_url")
+      @default_account.save_if_none response.object.fetch("account_id")
+      @default_project.save_if_none response.object.fetch("project_id")
       @default_region.save_if_none response.object.fetch("region")
 
       # Fetch credentials for build context upload

data/lib/envirobly/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Envirobly
-  VERSION = "1.5.2"
+  VERSION = "1.6.0"
 end

metadata

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