lono 7.4.2 → 7.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d5fb2024cd3b5206340c2c55347cda9af53f17fc8e165c0c72d5e03397fee376
-  data.tar.gz: 588801a14d28f01a374f0e9e906739d4872ad78ae98e760c1d03d0633ed1d435
+  metadata.gz: e7a001c358dbf937c901b77fff338512c2052e76882b54c77de5048e5e400c07
+  data.tar.gz: 71ab52b2e5af1533524c81e036b412017754db18f59a85da9e9a2b97cf9d14e7
 SHA512:
-  metadata.gz: 18d3f263e75e822bbaa8ae3e8a098a2d775fde0ead210082b38b0447f1c1ebaacd23458543f9114f7663efeb0d0616425a61aec16903b3b91bed5df2db01acc9
-  data.tar.gz: d72a837f16c0cfe93b0331fbad13bd88f3442901bf589357917612f44b35218f0f4a02b35de802a30ed9ed6a3d3bac2488271f00458ea3338ddeb2ffa306ac5d
+  metadata.gz: b062a87dc0476db11d5fe02f8866d5da0455549727015eb7d98a50dfe16802ea01ba5b9fa0efa3a2f3dc304a68d89cc6ee9747cf8e33a6e44cfb877ca3036489
+  data.tar.gz: 39919280a8d06fdb119018fe4fa173f9ab52ecb8979ff210bfd307c8362146cb446aedeadcdaccf86c6f22b207826b6a3a6a58f8f72098c2abb8de412933f579

data/CHANGELOG.md

@@ -3,6 +3,13 @@
 All notable changes to this project will be documented in this file.
 This project *tries* to adhere to [Semantic Versioning](http://semver.org/), even before v1.0.
 
+## [7.4.3]
+- #61 clean install fixes
+- improve tree detection
+- improve colordiff detection
+- improve AWS setup detection
+- remove bundler install for blueprint, extension, and configsets
+
 ## [7.4.2]
 - #60 fix edge case when cached materialized Gemfile.lock breaks finder
 

data/lib/lono/blueprint/new.rb

@@ -1,6 +1,7 @@
 class Lono::Blueprint
   class New < Lono::Sequence
     include Helper
+    include Lono::Utils::Generators::Tree
 
     argument :blueprint_name
 
@@ -95,17 +96,6 @@ class Lono::Blueprint
       FileUtils.cd(self.destination_root)
     end
 
-    def bundle_install
-      return if options[:from_new] || options[:import]
-
-      return unless options[:bundle]
-
-      puts "=> Installing dependencies with: bundle install"
-      Bundler.with_unbundled_env do
-        system("BUNDLE_IGNORE_CONFIG=1 bundle install")
-      end
-    end
-
     def welcome_message
       return if options[:from_new] || options[:import]
       puts <<~EOL
@@ -122,17 +112,7 @@ class Lono::Blueprint
     end
 
     def tree
-      return if options[:from_new] || options[:import]
-
-      tree_installed = system("type tree > /dev/null")
-      return unless tree_installed
-
-      structure = `tree .`
-      puts <<~EOL
-        Here is the structure of your blueprint:
-
-        #{structure}
-      EOL
+      tree_structure("blueprint")
     end
 
     # Reason: So `lono code import` prints out the params values with relative paths

data/lib/lono/cfn/preview/diff_viewer.rb

@@ -13,7 +13,11 @@ module Lono::Cfn::Preview
 
     def diff_viewer
       return ENV['LONO_DIFF'] if ENV['LONO_DIFF']
-      system("type colordiff > /dev/null") ? "colordiff" : "diff"
+      colordiff_installed = system("type colordiff > /dev/null 2>&1")
+      unless colordiff_installed
+        puts "INFO: colordiff it not available. Recommend installing it."
+      end
+      colordiff_installed ? "colordiff" : "diff"
     end
   end
 end

data/lib/lono/configset/new.rb

@@ -1,6 +1,7 @@
 class Lono::Configset
   class New < Lono::Sequence
     include Lono::Blueprint::Helper
+    include Lono::Utils::Generators::Tree
 
     argument :configset_name
 
@@ -70,15 +71,7 @@ class Lono::Configset
     end
 
     def tree
-      tree_installed = system("type tree > /dev/null")
-      return unless tree_installed
-
-      structure = `tree .`
-      puts <<~EOL
-        Here is the structure of your configset:
-
-        #{structure}
-      EOL
+      tree_structure("configset")
     end
   end
 end

data/lib/lono/extension/new.rb

@@ -2,6 +2,7 @@ class Lono::Extension
   class New < Lono::Sequence
     include Lono::Blueprint::Helper # for user_info
     include Lono::Extension::Helper
+    include Lono::Utils::Generators::Tree
 
     argument :extension_name
 
@@ -58,15 +59,7 @@ class Lono::Extension
     end
 
     def tree
-      tree_installed = system("type tree > /dev/null")
-      return unless tree_installed
-
-      structure = `tree .`
-      puts <<~EOL
-        Here is the structure of your extension:
-
-        #{structure}
-      EOL
+      tree_structure("extension")
     end
   end
 end

data/lib/lono/registration/temp.rb

@@ -38,7 +38,7 @@ class Lono::Registration
 
         More info: https://lono.cloud/docs/register/
 
-        Continue temporarily without registration? (y/N)
+        Continue without registration? (y/N)
       EOL
 
       answer = $stdin.gets.to_s.strip # nil on CI

data/lib/lono/s3/aws_setup.rb

@@ -0,0 +1,16 @@
+class Lono::S3
+  class AwsSetup
+    include Lono::AwsServices
+
+    def check!
+      s3.config.region
+    rescue Aws::Errors::MissingRegionError => e
+      puts "ERROR: #{e.class}: #{e.message}".color(:red)
+      puts <<~EOL
+        Unable to detect the AWS_REGION to make AWS API calls. This is might be because the AWS access
+        has not been set up yet. Please either your ~/.aws files.
+      EOL
+      exit 1
+    end
+  end
+end

data/lib/lono/s3/bucket.rb

@@ -10,6 +10,8 @@ class Lono::S3
       def name
         return @@name if @@name # only memoize once bucket has been created
 
+        check_aws_setup!
+
         stack = new.find_stack
         return unless stack
 
@@ -17,6 +19,10 @@ class Lono::S3
         bucket = resp.stack_resources.find { |r| r.logical_resource_id == "Bucket" }
         @@name = bucket.physical_resource_id # actual bucket name
       end
+
+      def check_aws_setup!
+        AwsSetup.new.check!
+      end
     end
 
     def initialize(options={})

data/lib/lono/utils/generators/tree.rb

@@ -0,0 +1,18 @@
+module Lono::Utils::Generators
+  module Tree
+  private
+    def tree_structure(name)
+      return if options[:from_new] || options[:import] # only for lono new
+
+      tree_installed = system("type tree > /dev/null 2>&1")
+      return unless tree_installed
+
+      structure = `tree .`
+      puts <<~EOL
+        Here is the structure of your #{name}:
+
+        #{structure}
+      EOL
+    end
+  end
+end

data/lib/lono/version.rb

@@ -1,3 +1,3 @@
 module Lono
-  VERSION = "7.4.2"
+  VERSION = "7.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lono
 version: !ruby/object:Gem::Version
-  version: 7.4.2
+  version: 7.4.3
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-03-27 00:00:00.000000000 Z
+date: 2020-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -628,6 +628,7 @@ files:
 - lib/lono/registration/temp.rb
 - lib/lono/registration/user.rb
 - lib/lono/s3.rb
+- lib/lono/s3/aws_setup.rb
 - lib/lono/s3/bucket.rb
 - lib/lono/s3/uploader.rb
 - lib/lono/script.rb
@@ -713,6 +714,7 @@ files:
 - lib/lono/template/util.rb
 - lib/lono/upgrade.rb
 - lib/lono/user_data.rb
+- lib/lono/utils/generators/tree.rb
 - lib/lono/utils/item/file_methods.rb
 - lib/lono/utils/item/zip.rb
 - lib/lono/utils/pretty_time.rb