forger 2.0.5 → 3.0.0

data/lib/forger/wait.rb

@@ -1,6 +1,4 @@
 module Forger
-  autoload :Waiter, 'forger/waiter'
-
   class Wait < Command
     desc "ami", "Wait until AMI available."
     long_desc Help.text("wait:ami")

data/lib/forger/waiter.rb

@@ -1,5 +1,4 @@
 module Forger
   module Waiter
-    autoload :Ami, 'forger/waiter/ami'
   end
 end

data/lib/forger/waiter/ami.rb

@@ -1,6 +1,6 @@
 module Forger::Waiter
   class Ami < Forger::Base
-    include Forger::AwsService
+    include Forger::AwsServices
 
     def wait
       delay = 30

data/lib/templates/default/app/user_data/bootstrap.sh.tt

@@ -1,12 +1,9 @@
-<% if @options[:s3_folder] -%>
+# Example of calling the extracted shared scripts
 # setup: shared functions, path, awscli, etc
-source /opt/scripts/shared/functions.sh
-export PATH=/usr/local/bin/:$PATH
-configure_aws_cli /root
-configure_aws_cli /home/ec2-user
-
-# install software
-/opt/scripts/install/common.sh
-<% end -%>
+# source /opt/scripts/shared/functions.sh
+# export PATH=/usr/local/bin/:$PATH
+# configure_aws_cli /root
+# configure_aws_cli /home/ec2-user
+# /opt/scripts/install/common.sh
 
 <%%= personalize_script %>

data/lib/templates/default/app/user_data/layouts/default.sh.tt

@@ -5,12 +5,8 @@ cd ~ # user-data starts off in / so go to $HOME
 
 <%%= add_ssh_key %>
 
-<% if options[:s3_folder] -%>
-<%%= extract_scripts(to: "/opt") %>
-<% else -%>
 # Uncomment to use extract_scripts and use app/scripts
-<%%# extract_scripts(to: "/opt") %>
-<% end -%>
+<%%=# extract_scripts(to: "/opt") %>
 
 <%%= yield %>
 

data/lib/templates/default/config/settings.yml.tt

@@ -8,18 +8,8 @@ base:
 # There are separate files to separate user defined variables and internal
 # setting configs.
 development:
-  # By setting s3_folder, forger will automatically tarball and upload your scripts
-  # to set. You then can then use the extract_scripts helper method to download
-  # the scripts onto the server.
-  # s3_folder: mybucket/path/to/folder # simple string
   # compile_clean: true # uncomment to clean
   # extract_scripts:
   #   to: "/opt"
   #   as: "ec2-user"
-  aws_profiles:
-    - my-aws-profile
-<% if @options[:s3_folder] -%>
-  s3_folder: <%= @options[:s3_folder] %>
-<% else -%>
-  # s3_folder: my-s3-bucket/ec2
-<% end -%>
+  aws_profile: my-aws-profile

data/spec/fixtures/demo_project/app/user_data/bootstrap.sh

@@ -1,4 +1,4 @@
 #!/bin/bash
 
-# test env variables from config/[ENV].yml file
-# test_key: <%= config["test_key"] %>
+# test env variables from config/variables/[FORGER_ENV].rb file
+# test_key: <%= @test_key %>

data/spec/fixtures/demo_project/config/settings.yml

@@ -13,10 +13,8 @@ development:
   # extract_scripts:
   #   to: "/opt"
   #   as: "ec2-user"
-  # aws_profiles:
-  #   - profile1
+  # aws_profile: profile1
 
 production:
   # s3_folder: mybucket/folder
-  # aws_profiles:
-  #   - profile2
+  # aws_profile: profile2

data/spec/fixtures/demo_project/config/variables/test.rb

@@ -0,0 +1,4 @@
+@subnets = %w[subnet-111 subnet-222]
+@security_group_ids = %w[sg-111]
+@test_key = ENV['TEST_KEY']
+

data/spec/fixtures/demo_project/profiles/default.yml

@@ -10,8 +10,8 @@ user_data: "<%= user_data("bootstrap.sh") %>"
 iam_instance_profile:
   name: <%= ENV['IAM_INSTANCE_PROFILE'] %>
 # public network settings
-security_group_ids: <%= config["security_group_ids"].inspect %>
-subnet_id: <%= config["subnets"].shuffle.first %>
+security_group_ids: <%= @security_group_ids.inspect %>
+subnet_id: <%= @subnets.shuffle.first %>
 block_device_mappings:
   - device_name: /dev/xvda
     ebs:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: forger
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 3.0.0
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-01-25 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: aws-sdk-cloudformation
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: aws-sdk-ec2
   requirement: !ruby/object:Gem::Requirement
@@ -52,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cfn-status
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: dotenv
   requirement: !ruby/object:Gem::Requirement
@@ -150,6 +178,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -235,8 +277,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: 
-email:
-- tongueroo@gmail.com
+email: tongueroo@gmail.com
 executables:
 - forger
 extensions: []
@@ -258,14 +299,19 @@ files:
 - docs/example/.env.production
 - docs/example/app/scripts/hello.sh
 - docs/example/app/user_data/bootstrap.sh
-- docs/example/config/development.yml
+- docs/example/config/variables/development.rb
 - docs/example/profiles/default.yml
 - docs/example/profiles/spot.yml
+- docs/extract-scripts.md
+- docs/layouts.md
+- docs/profiles.md
+- docs/variables.md
 - exe/forger
 - forger.gemspec
 - lib/forger.rb
 - lib/forger/ami.rb
-- lib/forger/aws_service.rb
+- lib/forger/autoloader.rb
+- lib/forger/aws_services.rb
 - lib/forger/base.rb
 - lib/forger/clean.rb
 - lib/forger/cleaner.rb
@@ -275,7 +321,6 @@ files:
 - lib/forger/completer.rb
 - lib/forger/completer/script.rb
 - lib/forger/completer/script.sh
-- lib/forger/config.rb
 - lib/forger/core.rb
 - lib/forger/create.rb
 - lib/forger/create/error_messages.rb
@@ -299,6 +344,8 @@ files:
 - lib/forger/network.rb
 - lib/forger/new.rb
 - lib/forger/profile.rb
+- lib/forger/s3.rb
+- lib/forger/s3/bucket.rb
 - lib/forger/script.rb
 - lib/forger/script/compile.rb
 - lib/forger/script/compress.rb
@@ -350,13 +397,13 @@ files:
 - lib/templates/default/app/scripts/shared/functions.sh
 - lib/templates/default/app/user_data/bootstrap.sh.tt
 - lib/templates/default/app/user_data/layouts/default.sh.tt
-- lib/templates/default/config/development.yml.tt
 - lib/templates/default/config/settings.yml.tt
+- lib/templates/default/config/variables/development.yml.tt
 - lib/templates/default/profiles/default.yml.tt
 - spec/fixtures/demo_project/.env.test
 - spec/fixtures/demo_project/app/user_data/bootstrap.sh
 - spec/fixtures/demo_project/config/settings.yml
-- spec/fixtures/demo_project/config/test.yml
+- spec/fixtures/demo_project/config/variables/test.rb
 - spec/fixtures/demo_project/profiles/default.yml
 - spec/lib/cli_spec.rb
 - spec/lib/core_helper_spec.rb
@@ -381,16 +428,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
-summary: Tool to create AWS ec2 instances
+summary: Create EC2 Instances with preconfigured settings
 test_files:
 - spec/fixtures/demo_project/.env.test
 - spec/fixtures/demo_project/app/user_data/bootstrap.sh
 - spec/fixtures/demo_project/config/settings.yml
-- spec/fixtures/demo_project/config/test.yml
+- spec/fixtures/demo_project/config/variables/test.rb
 - spec/fixtures/demo_project/profiles/default.yml
 - spec/lib/cli_spec.rb
 - spec/lib/core_helper_spec.rb

data/docs/example/config/development.yml

@@ -1,7 +0,0 @@
----
-subnets:
-  - subnet-111
-  - subnet-222
-  - subnet-333
-security_group_ids:
-  - sg-111

data/lib/forger/aws_service.rb

@@ -1,7 +0,0 @@
-require 'aws-sdk-ec2'
-
-module Forger::AwsService
-  def ec2
-    @ec2 ||= Aws::EC2::Client.new
-  end
-end

data/lib/forger/config.rb

@@ -1,25 +0,0 @@
-require 'yaml'
-require 'render_me_pretty'
-
-module Forger
-  class Config < Base
-    include Forger::Template
-
-    def initialize(options={})
-      super
-      @path = options[:path] || "#{Forger.root}/config/#{Forger.env}.yml"
-    end
-
-    @@data = nil
-    def data
-      return @@data if @@data
-
-      text = RenderMePretty.result(@path, context: context)
-      @@data = YAML.load(text)
-    rescue Errno::ENOENT => e
-      puts e.message
-      puts "The #{@path} does not exist. Please double check that it exists."
-      exit
-    end
-  end
-end

data/spec/fixtures/demo_project/config/test.yml

@@ -1,8 +0,0 @@
----
-subnets:
-  - subnet-123
-  - subnet-456
-security_group_ids:
-  - sg-123 # test-single-instance
-s3_bucket: my-bucket # for the user-data shared scripts
-test_key: <%= ENV['TEST_KEY'] %>