forger 2.0.4 → 2.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 87afc9047bd6ddfd919e409829ff4a41eb4e4278a9b49f8e4ed2d4203392aa20
-  data.tar.gz: 1f57d952114627db436d8c66847fcfd297138b8741090388a4a96dd5cb7f77c4
+  metadata.gz: 24b35480802991ec9af7a567180f74723adabcf858c5b4ddcc6fc14a3944d7f7
+  data.tar.gz: 046b74aae0f9b3d7cdeefbcaabd6409f0485cb2974c111667e6e03b26f2e473c
 SHA512:
-  metadata.gz: 6eea81c540ba1eaf35aa6ce7cc5e6308019ca4eb6927664380c1029a2458122577c26c8357c02838625781b428b52bd859000bafd043376cc4ac4cf6f273edc0
-  data.tar.gz: a1d92f74984329a186d0e7bee07f9ad60adb3277737f81e9b2c80c67e51723a63fa9a78671abdae3ca85d13ac3a5f0f02325fd8fcfbd4d4619cf782635c8b265
+  metadata.gz: fb5996ebc2e3059ff16f6ffb4487be82c2348495167479c834de6f33550b282995a717ecfa67ebd739b1773b61e6c231e0744c3b3546fe6c54ddcd9959773f19
+  data.tar.gz: da660ea8453c5905d74507a19a34e9243610d943e60fcacc2f3abcc341141926abf5c3dabdbe9ebc7b0eaae0cc5a8d952bc86e4d0b44c01a32b4026110c244f4

data/.circleci/config.yml

@@ -0,0 +1,67 @@
+# Ruby CircleCI 2.0 configuration file
+#
+# Check https://circleci.com/docs/2.0/language-ruby/ for more details
+#
+version: 2
+jobs:
+  build:
+    docker:
+      # specify the version you desire here
+      - image: circleci/ruby:2.5.3
+
+    working_directory: ~/repo
+
+    steps:
+      - checkout
+
+      - run:
+          name: submodule sync
+          command: |
+            git submodule sync
+            git submodule update --init
+
+      # Download and cache dependencies
+      # Cannot cache with Gemfile.lock since it is gitignore.
+      # Not caching with Gemfile, would rather not.
+      # - restore_cache:
+      #     keys:
+      #     - v2-dependencies-{{ checksum "Gemfile.lock" }}
+      #     # fallback to using the latest cache if no exact match is found
+      #     - v2-dependencies-
+
+      - run:
+          name: install dependencies
+          command: |
+            bundle install --jobs=4 --retry=3 --path vendor/bundle
+
+      # - save_cache:
+      #     paths:
+      #       - ./vendor/bundle
+      #     key: v2-dependencies-{{ checksum "Gemfile.lock" }}
+
+      # test require this
+      - run:
+          name: configure git
+          command: |
+            git config --global user.email "tongueroo@gmail.com"
+            git config --global user.name "Tung Nguyen"
+
+      # run tests!
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+
+            cat >.rspec <<EOL
+            --format documentation
+            --require spec_helper
+            EOL
+
+            bundle exec rspec
+
+      # collect reports
+      - store_test_results:
+          path: /tmp/test-results
+      - store_artifacts:
+          path: /tmp/test-results
+          destination: test-results

data/CHANGELOG.md

@@ -3,6 +3,10 @@
 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.
 
+## [2.0.5]
+- add circle config: circleci 2.0
+- use rainbow gem for terminal colors
+
 ## [2.0.4]
 - Merge pull request #15 from tongueroo/tmp-write-area: move write operations to /tmp area
 

data/Gemfile.lock

@@ -1,15 +1,15 @@
 PATH
   remote: .
   specs:
-    forger (2.0.4)
+    forger (2.0.5)
       activesupport
       aws-sdk-ec2
       aws-sdk-s3
-      colorize
       dotenv
       filesize
       hashie
       memoist
+      rainbow
       render_me_pretty
       thor
 
@@ -22,30 +22,29 @@ GEM
       minitest (~> 5.1)
       tzinfo (~> 1.1)
     aws-eventstream (1.0.1)
-    aws-partitions (1.125.0)
-    aws-sdk-core (3.44.0)
+    aws-partitions (1.135.0)
+    aws-sdk-core (3.46.0)
       aws-eventstream (~> 1.0)
       aws-partitions (~> 1.0)
       aws-sigv4 (~> 1.0)
       jmespath (~> 1.0)
-    aws-sdk-ec2 (1.63.0)
+    aws-sdk-ec2 (1.67.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
     aws-sdk-kms (1.13.0)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sigv4 (~> 1.0)
-    aws-sdk-s3 (1.30.0)
+    aws-sdk-s3 (1.30.1)
       aws-sdk-core (~> 3, >= 3.39.0)
       aws-sdk-kms (~> 1)
       aws-sigv4 (~> 1.0)
     aws-sigv4 (1.0.3)
     byebug (10.0.2)
     coderay (1.1.2)
-    colorize (0.8.1)
     concurrent-ruby (1.1.4)
     diff-lcs (1.3)
-    dotenv (2.5.0)
-    ffi (1.9.25)
+    dotenv (2.6.0)
+    ffi (1.10.0)
     filesize (0.2.0)
     formatador (0.2.5)
     guard (2.15.0)
@@ -57,8 +56,8 @@ GEM
       pry (>= 0.9.12)
       shellany (~> 0.0)
       thor (>= 0.18.1)
-    guard-bundler (2.1.0)
-      bundler (~> 1.0)
+    guard-bundler (2.2.1)
+      bundler (>= 1.3.0, < 3)
       guard (~> 2.2)
       guard-compat (~> 1.1)
     guard-compat (1.2.1)
@@ -67,7 +66,7 @@ GEM
       guard-compat (~> 1.1)
       rspec (>= 2.99.0, < 4.0)
     hashie (3.6.0)
-    i18n (1.2.0)
+    i18n (1.5.3)
       concurrent-ruby (~> 1.0)
     jmespath (1.4.0)
     listen (3.1.5)
@@ -85,13 +84,14 @@ GEM
     pry (0.12.2)
       coderay (~> 1.1.0)
       method_source (~> 0.9.0)
+    rainbow (3.0.0)
     rake (12.3.2)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
       ffi (~> 1.0)
-    render_me_pretty (0.8.1)
+    render_me_pretty (0.8.2)
       activesupport
-      colorize
+      rainbow
       tilt
     rspec (3.8.0)
       rspec-core (~> 3.8.0)

data/forger.gemspec

@@ -21,11 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency "activesupport"
   spec.add_dependency "aws-sdk-ec2"
   spec.add_dependency "aws-sdk-s3"
-  spec.add_dependency "colorize"
   spec.add_dependency "dotenv"
   spec.add_dependency "filesize"
   spec.add_dependency "hashie"
   spec.add_dependency "memoist"
+  spec.add_dependency "rainbow"
   spec.add_dependency "render_me_pretty"
   spec.add_dependency "thor"
 

data/lib/forger.rb

@@ -1,6 +1,6 @@
 $:.unshift(File.expand_path("../", __FILE__))
 require "forger/version"
-require "colorize"
+require "rainbow/ext/string"
 require "render_me_pretty"
 require "memoist"
 

data/lib/forger/core.rb

@@ -27,7 +27,7 @@ module Forger
 
     def validate_in_project!
       unless File.exist?("#{root}/profiles")
-        puts "Could not find a profiles folder in the current directory.  It does not look like you are running this command within a forger project.  Please confirm that you are in a forger project and try again.".colorize(:red)
+        puts "Could not find a profiles folder in the current directory.  It does not look like you are running this command within a forger project.  Please confirm that you are in a forger project and try again.".color(:red)
         exit
       end
     end

data/lib/forger/create.rb

@@ -17,7 +17,7 @@ module Forger
       Hook.run(:before_run_instances, @options)
       sync_scripts_to_s3
 
-      puts "Creating EC2 instance #{@name.colorize(:green)}"
+      puts "Creating EC2 instance #{@name.color(:green)}"
       info = Info.new(@options, params)
       info.ec2_params
       if @options[:noop]

data/lib/forger/create/error_messages.rb

@@ -24,7 +24,7 @@ EOL
     end
 
     def print_error_message(exception, message)
-      puts "ERROR: Unable to launch the instance.".colorize(:red)
+      puts "ERROR: Unable to launch the instance.".color(:red)
       puts message
       puts exception.message
       puts "For the full internal backtrace re-run the command with DEBUG=1"

data/lib/forger/create/waiter.rb

@@ -62,7 +62,7 @@ class Forger::Create
     end
 
     def display_ssh(command)
-      puts "=> #{command.join(' ')}".colorize(:green)
+      puts "=> #{command.join(' ')}".color(:green)
     end
 
     def retry_until_success(*command)

data/lib/forger/hook.rb

@@ -21,7 +21,7 @@ module Forger
     end
 
     def sh(command)
-      puts "=> #{command}".colorize(:green)
+      puts "=> #{command}".color(:green)
       success = system(command)
       abort("Command failed") unless success
     end

data/lib/forger/network.rb

@@ -19,7 +19,7 @@ module Forger
       if default_vpc
         default_vpc.vpc_id
       else
-        puts "A default vpc was not found in this AWS account and region.".colorize(:red)
+        puts "A default vpc was not found in this AWS account and region.".color(:red)
         puts "Because there is no default vpc, please specify the --vpc-id option.  More info: http://ufoships.com/reference/ufo-init/"
         exit 1
       end

data/lib/forger/profile.rb

@@ -15,15 +15,15 @@ module Forger
       file = profile_file(profile_name)
       return if File.exist?(file)
 
-      puts "Unable to find a #{file.colorize(:green)} profile file."
-      puts "Please double check that it exists or that you specified the right profile.".colorize(:red)
+      puts "Unable to find a #{file.color(:green)} profile file."
+      puts "Please double check that it exists or that you specified the right profile.".color(:red)
       exit 1
     end
 
     def load_profile(file)
       return {} unless File.exist?(file)
 
-      puts "Using profile: #{file}".colorize(:green)
+      puts "Using profile: #{file}".color(:green)
       text = RenderMePretty.result(file, context: context)
       begin
         data = YAML.load(text)
@@ -31,7 +31,7 @@ module Forger
         tmp_file = file.sub("profiles", Forger.build_root)
         FileUtils.mkdir_p(File.dirname(tmp_file))
         IO.write(tmp_file, text)
-        puts "There was an error evaluating in your yaml file #{file}".colorize(:red)
+        puts "There was an error evaluating in your yaml file #{file}".color(:red)
         puts "The evaludated yaml file has been saved at #{tmp_file} for debugging."
         puts "ERROR: #{e.message}"
         exit 1

data/lib/forger/script/compile.rb

@@ -20,7 +20,7 @@ class Forger::Script
     end
 
     def compile_folder(folder, layout_path=false)
-      puts "Compiling app/#{folder} to tmp/app/#{folder}.".colorize(:green)
+      puts "Compiling app/#{folder} to tmp/app/#{folder}.".color(:green)
       Dir.glob("#{Forger.root}/app/#{folder}/**/*").each do |path|
         next if File.directory?(path)
         next if path.include?("layouts")

data/lib/forger/script/compress.rb

@@ -4,7 +4,7 @@ class Forger::Script
   class Compress < Forger::Base
     def compress
       reset
-      puts "Tarballing #{BUILD_ROOT}/app/scripts folder to scripts.tgz".colorize(:green)
+      puts "Tarballing #{BUILD_ROOT}/app/scripts folder to scripts.tgz".color(:green)
       tarball_path = create_tarball
       save_scripts_info(tarball_path)
       puts "Tarball created at #{tarball_path}"

data/lib/forger/script/upload.rb

@@ -27,18 +27,18 @@ class Forger::Script
         return
       end
 
-      puts "Uploading scripts.tgz (#{filesize}) to #{s3_dest}".colorize(:green)
+      puts "Uploading scripts.tgz (#{filesize}) to #{s3_dest}".color(:green)
       obj = s3_resource.bucket(bucket_name).object(key)
       start_time = Time.now
       upload_to_s3(obj, tarball_path)
-      time_took = pretty_time(Time.now-start_time).colorize(:green)
+      time_took = pretty_time(Time.now-start_time).color(:green)
       puts "Time to upload code to s3: #{time_took}"
     end
 
     def upload_to_s3(obj, tarball_path)
       obj.upload_file(tarball_path)
     rescue Aws::S3::Errors::PermanentRedirect => e
-      puts "ERROR: #{e.class} #{e.message}".colorize(:red)
+      puts "ERROR: #{e.class} #{e.message}".color(:red)
       puts "The bucket you are trying to upload scripts to is in a different region than the region the instance is being launched in."
       puts "You must configured FORGER_S3_ENDPOINT env variable to prevent this error. Example:"
       puts "  FORGER_S3_ENDPOINT=https://s3.us-west-2.amazonaws.com"
@@ -46,7 +46,7 @@ class Forger::Script
       exit 1
     rescue Aws::S3::Errors::AccessDenied, Aws::S3::Errors::AllAccessDisabled
       e = $!
-      puts "ERROR: #{e.class} #{e.message}".colorize(:red)
+      puts "ERROR: #{e.class} #{e.message}".color(:red)
       puts "You do not have permission to upload scripts to this bucket: #{bucket_name}.  Are you sure the right bucket is configured?"
       if ENV['AWS_PROFILE']
         puts "Also maybe check your AWS_PROFILE env. Current AWS_PROFILE=#{ENV['AWS_PROFILE']}"

data/lib/forger/sequence.rb

@@ -1,5 +1,4 @@
 require 'fileutils'
-require 'colorize'
 require 'active_support/core_ext/string'
 require 'thor'
 require 'bundler'

data/lib/forger/setting.rb

@@ -13,7 +13,7 @@ module Forger
       return @@data if @@data
 
       if @check_project && !File.exist?(project_settings_path)
-        puts "ERROR: No settings file at #{project_settings_path}.  Are you sure you are in a forger project?".colorize(:red)
+        puts "ERROR: No settings file at #{project_settings_path}.  Are you sure you are in a forger project?".color(:red)
         exit 1
       end
 

data/lib/forger/template/helper/ami_helper.rb

@@ -16,7 +16,7 @@ module Forger::Template::Helper::AmiHelper
     if image
       image.image_id
     else
-      puts "latest_ami helper method could not find an AMI with the query of: #{query.inspect}".colorize(:red)
+      puts "latest_ami helper method could not find an AMI with the query of: #{query.inspect}".color(:red)
       exit 1
     end
   end

data/lib/forger/template/helper/core_helper.rb

@@ -9,7 +9,7 @@ module Forger::Template::Helper::CoreHelper
 
     path = "#{Forger.root}/app/user_data/#{name}"
     unless File.exist?(path)
-      puts "ERROR: user-data script #{path.colorize(:red)} does not exist"
+      puts "ERROR: user-data script #{path.color(:red)} does not exist"
       exit
     end
     result = RenderMePretty.result(path, context: self, layout: layout_path)
@@ -50,7 +50,7 @@ module Forger::Template::Helper::CoreHelper
 
     # other named layouts should error if it doesnt exit
     unless File.exist?(layout_path)
-      puts "ERROR: Layout #{layout_path} does not exist. Are you sure it exists?  Exiting".colorize(:red)
+      puts "ERROR: Layout #{layout_path} does not exist. Are you sure it exists?  Exiting".color(:red)
       exit 1
     end
 

data/lib/forger/template/helper/partial_helper.rb

@@ -55,11 +55,11 @@ private
     end
 
     if paths.size > 1 # ambiguous match
-      puts "ERROR: Multiple possible partials found:".colorize(:red)
+      puts "ERROR: Multiple possible partials found:".color(:red)
       paths.each do |path|
         puts "  #{path}"
       end
-      puts "Please specify an extension in the name to remove the ambiguity.".colorize(:green)
+      puts "Please specify an extension in the name to remove the ambiguity.".color(:green)
       exit 1
     end
 

data/lib/forger/template/helper/script_helper.rb

@@ -10,7 +10,7 @@ module Forger::Template::Helper::ScriptHelper
     user = options[:as] || "ec2-user"
 
     if Dir.glob("#{Forger.root}/app/scripts*").empty?
-      puts "WARN: you are using the extract_scripts helper method but you do not have any app/scripts.".colorize(:yellow)
+      puts "WARN: you are using the extract_scripts helper method but you do not have any app/scripts.".color(:yellow)
       calling_line = caller[0].split(':')[0..1].join(':')
       puts "Called from: #{calling_line}"
       return ""
@@ -38,7 +38,7 @@ private
     lines = caller.reject { |l| l =~ %r{lib/forger} } # hide internal forger trace
     puts "  #{lines[0]}"
 
-    puts "Please configure your config/settings.yml with an s3_folder.".colorize(:red)
+    puts "Please configure your config/settings.yml with an s3_folder.".color(:red)
     exit 1
   end
 

data/lib/forger/version.rb

@@ -1,3 +1,3 @@
 module Forger
-  VERSION = "2.0.4"
+  VERSION = "2.0.5"
 end

data/spec/lib/cli_spec.rb

@@ -11,7 +11,8 @@ describe Forger::CLI do
 
     it "ERB evaluates dotenv files" do
       out = execute("exe/forger create server #{@args}")
-      user_data = IO.readlines("spec/fixtures/demo_project/tmp/user-data.txt")
+      project_name = ENV['CIRCLECI'] ? 'repo' : 'forger'
+      user_data = IO.readlines("/tmp/forger/#{project_name}/user-data.txt")
       found = !user_data.select { |l| l =~ /test_key: test-key-value/ }.empty?
       expect(found).to be true
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forger
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-17 00:00:00.000000000 Z
+date: 2019-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: dotenv
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dotenv
+  name: filesize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: filesize
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: memoist
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -109,7 +109,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: memoist
+  name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -242,6 +242,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".gitmodules"
 - ".rspec"