rebi 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d5506d4a48ece06d7c2c3cc00b56e931ae6aeb3
-  data.tar.gz: 27748616915072f0eb9de0f9c588a64680212598
+  metadata.gz: 5b3bc75f16245ff841a3e7c29293327662b472cb
+  data.tar.gz: 06e7e7422dd0486c9b5e9d97c57050b90c653fe8
 SHA512:
-  metadata.gz: c8575bb0477ce90c205cdbbcf07000d508594281605d1e406d7ccfa6247ee4f47d6c0e3886deb139982d929b120f4af9a82b3c77936522f5aebc8f8c0b558988
-  data.tar.gz: 1643039aaa197bbb8303b6ecbaa50ff3cb49522ab86b7f3e46ebaab129913403c6c477fe6e05098d24b3afef666ed99dde0738f5a663099d5e5b7100a22678e7
+  metadata.gz: f246e720ffdade2afa9bedcb788db84976633f33423fe4f31b1399b4719ff2328c212c974bace37771c74beaa30dabf70536eb821d123b0b90c1205e93da53da
+  data.tar.gz: b7b6e94f5fa07647dba0a27105c147ef6f6164a20d2b542e9f1161d15d4ac90ce8c31a06cdb8f2d1823ef7616ffcaf9c659e87a03c09b82ab113184f791c258a

data/README.md

@@ -20,6 +20,13 @@ $ gem install rebi
 
 ## Usage
 
+### Init
+
+```bash
+$ bundle exec rebi init staging web
+# use profile option if you're using aws profile
+```
+
 ### Yaml config
 Default config file is `.rebi.yml` use `-c` to switch
 ```yaml
@@ -77,9 +84,11 @@ $ bundle exec rebi --help
 
 ### ERB in ebextensions config
 Use `rebi.env` to get environment variables config in .ebextensions
+config file name must end with .config.erb
+
 ```yaml
 # Ex
-# .ebextensions/00-envrionments.config
+# .ebextensions/00-envrionments.config.erb
 option_settings:
   - option_name: KEY
     value: <%= rebi.env[KEY] %>

data/bin/rebi

@@ -109,10 +109,22 @@ end
 command :ssh do |c|
   c.syntax = 'rebi ssh stage env_name'
   c.description = "Ssh into instance"
-  c.option '-s','--select', 'Get environment variables from config'
+  c.option '-s','--select', 'Select instance ids'
   c.action do |args, options|
     stage, env_name = args
     raise Rebi::Error.new("Stage cannot be nil") if stage.blank?
     Rebi.app.ssh_interaction stage, env_name, options.__hash__
   end
 end
+
+command :init do |c|
+  c.syntax = "rebi init stage_name env_name"
+  c.description = "Init"
+  c.action do |args, options|
+    stage, env = args
+    raise Rebi::Error.new("Stage cannot be nil") if stage.blank?
+    raise Rebi::Error.new("Env cannot be blank") if env.blank?
+
+    Rebi.init stage, env
+  end
+end

data/lib/rebi.rb

@@ -27,6 +27,8 @@ require 'rebi/config'
 require 'rebi/config_environment'
 require 'rebi/error'
 require 'rebi/ec2'
+require 'rebi/eb'
+require 'rebi/init_service'
 require 'rebi/version'
 
 # Dotenv.load
@@ -43,11 +45,11 @@ module Rebi
   end
 
   def eb c=nil
-    @@eb = Aws::ElasticBeanstalk::Client.new
+    @@eb = Rebi::EB.new
   end
 
   def ec2
-    @@ec2_client = Rebi::EC2.new Aws::EC2::Client.new
+    @@ec2_client = Rebi::EC2.new
   end
 
   def iam
@@ -71,4 +73,9 @@ module Rebi
     config.reload!
   end
 
+  def init stage_name, env_name
+    init = Rebi::InitService.new(stage_name, env_name)
+    init.execute
+  end
+
 end

data/lib/rebi/application.rb

@@ -171,6 +171,7 @@ module Rebi
     end
 
     def self.get_or_create_application app_name
+      raise "App name cannot be nil" if app_name.blank?
       begin
         return get_application app_name
       rescue Error::ApplicationNotFound

data/lib/rebi/config.rb

@@ -2,6 +2,7 @@ module Rebi
   class Config
     include Singleton
 
+    attr_accessor :data
     def initialize
       reload!
     end
@@ -41,12 +42,16 @@ module Rebi
       data[:app_name]
     end
 
+    def app_name=name
+      data[:app_name] = name
+    end
+
     def app_description
       data[:app_description] || "Created via rebi"
     end
 
     def stage stage
-      data[:stages][stage] || raise(Rebi::Error::ConfigNotFound.new("Stage: #{stage}"))
+      data[:stages] && data[:stages][stage] || raise(Rebi::Error::ConfigNotFound.new("Stage: #{stage}"))
     end
 
     def timeout
@@ -74,14 +79,26 @@ module Rebi
       data[:stages].keys
     end
 
-    private
     def data
-      @data ||= YAML::load(ERB.new(IO.read(config_file)).result).with_indifferent_access
-      raise Rebi::Error::ConfigInvalid.new("app_name cannot be nil") if @data[:app_name].blank?
-      raise Rebi::Error::ConfigInvalid.new("stages cannot be nil") if @data[:stages].blank?
+      return @data unless @data.nil?
+      begin
+        @data = YAML::load(ERB.new(IO.read(config_file)).result).with_indifferent_access
+      rescue Errno::ENOENT
+        @data = {}.with_indifferent_access
+      end
       return @data
     end
 
+    def push_to_file
+      File.open(config_file, "wb") do |f|
+        f.write JSON.parse(data.to_json).to_yaml
+      end
+
+      Rebi.log "Saved config to #{config_file}"
+      Rebi.log "For more configs, please refer sample or github"
+    end
+
+    private
     def set_aws_config
       conf = {}
 

data/lib/rebi/config_environment.rb

@@ -42,6 +42,16 @@ module Rebi
 
     DEFAULT_IAM_INSTANCE_PROFILE = "aws-elasticbeanstalk-ec2-role"
 
+
+    DEFAULT_CONFIG = {
+      tier: "web",
+      instance_type: "t2.micro",
+      instance_num: {
+        min: 1,
+        max: 1,
+      }
+    }
+
     def initialize stage, env_name, env_conf={}
       @raw_conf = env_conf.with_indifferent_access
       @stage = stage.to_sym
@@ -52,6 +62,11 @@ module Rebi
       @name ||= raw_conf[:name] || "#{env_name}-#{stage}"
     end
 
+
+    def name=n
+      raw_conf[:name] ||= @name = n
+    end
+
     def app_name
       Rebi.config.app_name
     end
@@ -71,7 +86,7 @@ module Rebi
       elsif cfg.present? && cfg[:EnvironmentTier].present? && cfg[:EnvironmentTier][:Name].present?
         cfg[:EnvironmentTier][:Name] == "Worker" ? :worker : :web
       else
-        :web
+        DEFAULT_CONFIG[:tier].to_sym
       end
 
       @tier = if t == :web
@@ -128,6 +143,7 @@ module Rebi
     end
 
     def cfg_file
+      return nil
       @cfg_file ||= raw_conf[:cfg_file]
       return @cfg_file if @cfg_file.blank?
       return @cfg_file if Pathname.new(@cfg_file).absolute?
@@ -153,7 +169,7 @@ module Rebi
     end
 
     def solution_stack_name
-      @solution_stack_name ||= raw_conf[:solution_stack_name] || "64bit Amazon Linux 2017.09 v2.6.0 running Ruby 2.4 (Puma)"
+      @solution_stack_name ||= raw_conf[:solution_stack_name] || "64bit Amazon Linux 2017.09 v2.6.5 running Ruby 2.4 (Puma)"
     end
 
     def platform_arn
@@ -170,6 +186,11 @@ module Rebi
       end
     end
 
+    def ebignore
+      return @ebignore ||= raw_conf[:ebignore] || ".ebignore"
+    end
+
+
     def raw_environment_variables
       raw_conf[:environment_variables] || {}
     end

data/lib/rebi/eb.rb

@@ -0,0 +1,55 @@
+class Rebi::EB
+
+  attr_reader :client
+  def initialize client=Aws::ElasticBeanstalk::Client.new
+    @client = client
+  end
+
+  def applications
+    client.describe_applications.applications.map(&:application_name)
+  end
+
+  def solution_stacks
+    @solution_stacks = client.list_available_solution_stacks.solution_stacks.map do |s|
+      stacks_from_string s
+    end
+  end
+
+  def platforms
+    @platforms ||= solution_stacks.map do |st|
+      st["platform"]
+    end.uniq
+  end
+
+  def versions_by_platform platform
+    raise "Invalid platform" unless platforms.include?(platform)
+
+    solution_stacks.select do |st|
+      st["platform"] == platform
+    end.map do |st|
+      st["version"]
+    end.uniq
+  end
+
+  def get_solution_stack platform, version
+    solution_stacks.find do |st|
+      st["platform"] == platform && st["version"] == version
+    end["solution_stack"]
+  end
+
+  def method_missing(m, *args, &block)
+    client.send(m, *args, &block)
+  end
+
+  private
+
+  def stacks_from_string s
+    res = {}.with_indifferent_access
+    res[:platform] = s.match('.+running\s([^0-9]+).*')&.captures&.first.try(:strip)
+    res[:version] = s.match('.+running\s(.*)')&.captures&.first.try(:strip)
+    res[:server] = s.match('(.*)\srunning\s.*')&.captures&.first.try(:strip)
+    res[:stack_version] = s.match('.+v([0-9.]+)\srunning\s.*')&.captures&.first.try(:strip)
+    res[:solution_stack] = s
+    res
+  end
+end

data/lib/rebi/ec2.rb

@@ -5,7 +5,7 @@ module Rebi
 
     attr_reader :client
 
-    def initialize client
+    def initialize client=Aws::EC2::Client.new
       @client = client
     end
 

data/lib/rebi/environment.rb

@@ -182,7 +182,7 @@ module Rebi
     def create_app_version opts={}
       return if opts[:settings_only]
       start = Time.now.utc
-      source_bundle = Rebi::ZipHelper.new.gen(self.config, opts)
+      source_bundle = Rebi::ZipHelper.new(self.config, opts).gen
       version_label = source_bundle[:label]
       key = "#{app_name}/#{version_label}.zip"
       log("Uploading source bundle: #{version_label}.zip")
@@ -303,8 +303,17 @@ module Rebi
 
       Rebi.ec2.authorize_ssh instance_id do
         user = "ec2-user"
-        key_file = "~/.ssh/#{instance.key_name}.pem"
-        raise Rebi::Error::KeyFileNotFound unless File.exists? File.expand_path(key_file)
+        key_files = [
+          "~/.ssh/#{instance.key_name}.pem",
+          "~/.ssh/#{instance.key_name}",
+        ]
+
+        key_file = key_files.find do |f|
+          File.exists? File.expand_path(f)
+        end
+
+        raise Rebi::Error::KeyFileNotFound unless key_file.present?
+
         cmd = "ssh -i #{key_file} #{user}@#{instance.public_ip_address}"
         log cmd
 

data/lib/rebi/init_service.rb

@@ -0,0 +1,109 @@
+module Rebi
+
+  class InitService
+
+    include Rebi::Log
+
+    attr_reader :stage_name, :env_name, :stage, :env_data
+
+    def initialize stage_name, env_name
+      if config.app_name.blank?
+        config.app_name = get_appname
+      end
+      @stage_name = stage_name
+      @env_name = env_name
+      config.data[:stages] ||= {}.with_indifferent_access
+
+      begin
+        @stage = config.stage stage_name
+        raise "Already exists" if @stage.keys.include? env_name
+      rescue Rebi::Error::ConfigNotFound
+        config.data[:stages][stage_name] = {}.with_indifferent_access
+      end
+
+      config.data[:stages][stage_name].merge!({
+        env_name => ConfigEnvironment::DEFAULT_CONFIG.clone
+      }.with_indifferent_access)
+
+      @env_data = config.data[:stages][stage_name][env_name]
+    end
+
+    def config
+      Rebi.config
+    end
+
+    def eb
+      @eb ||= Rebi.eb
+    end
+
+    def execute
+      env_data.reverse_merge!({name: get_envname})
+      env_data[:solution_stack_name] = get_solution_stack
+      config.push_to_file
+    end
+
+    def get_appname
+      app_name = nil
+      if (apps = eb.applications).present?
+        idx = -1
+        while idx < 0 || idx > apps.count
+          apps.each.with_index do |app, idx|
+            log "#{idx + 1}: #{app}"
+          end
+          log "0: Create new application"
+          idx = ask_for_integer "Select application:"
+        end
+        app_name = idx > 0 ? apps[idx - 1] : nil
+      end
+
+      if app_name.blank?
+        app_name = ask_for_string "Enter application name:"
+      end
+
+      app_name
+    end
+
+    def get_envname
+      name = ask_for_string "Enter environment name(Default: #{default_envname}):"
+      name = name.chomp.gsub(/\s+/, "")
+
+      name = name.present? ? name : default_envname
+      name
+    end
+
+    def default_envname
+      "#{env_name}-#{stage_name}"
+    end
+
+    def get_solution_stack
+      idx = 0
+      platform = nil
+      version = nil
+      while idx <= 0 || idx > eb.platforms.count
+        eb.platforms.each.with_index do |pl, idx|
+          log "#{idx + 1}: #{pl}"
+        end
+        idx = ask_for_integer "Select platform:"
+      end
+
+      platform = eb.platforms[idx - 1]
+      versions = eb.versions_by_platform platform
+      idx = versions.count <= 1 ? 1 : 0
+
+      while idx <=0 || idx > versions.count
+        versions.each.with_index do |ver, idx|
+          log "#{idx + 1}: #{ver}"
+        end
+        idx = ask_for_integer "Select version:"
+      end
+
+      version = versions[idx - 1]
+
+      eb.get_solution_stack platform, version
+    end
+
+    def log_label
+      ""
+    end
+  end
+end

data/lib/rebi/log.rb

@@ -1,7 +1,7 @@
 module Rebi
   module Log
     def log mes, label=self.log_label
-        puts "#{label ? "#{colorize_prefix(label)}: " : ""}#{mes}"
+        puts "#{label.present? ? "#{colorize_prefix(label)}: " : ""}#{mes}"
     end
 
     def error mes, label=self.error_label

data/lib/rebi/version.rb

@@ -1,3 +1,3 @@
 module Rebi
-  VERSION = '0.3.2'
+  VERSION = '0.4.0'
 end

data/lib/rebi/zip_helper.rb

@@ -3,12 +3,18 @@ module Rebi
 
     include Rebi::Log
 
-    EB_IGNORE = ".ebignore"
+    attr_reader :env_conf, :opts
 
-    def initialize
+    def initialize env_conf,opts={}
+      @env_conf = env_conf
+      @opts = opts
       # raise Rebi::Error::NoGit.new("Not a git repository") unless git?
     end
 
+    def staged?
+      opts[:staged]
+    end
+
     def git?
       `git status 2>&1`
       $?.success?
@@ -18,13 +24,13 @@ module Rebi
       `git ls-files 2>&1`.split("\n")
     end
 
-    def raw_zip_archive opts={}
+    def raw_zip_archive
       tmp_file = Tempfile.new("git_archive")
       if !git? || ebignore?
         Zip::File.open(tmp_file.path, Zip::File::CREATE) do |z|
           spec = ebignore_spec
           Dir.glob("**/*").each do |f|
-            next if ebignore_spec.match f
+            next if spec.match f
             if File.directory?(f)
               z.mkdir f unless z.find_entry f
             else
@@ -33,7 +39,7 @@ module Rebi
           end
         end
       else
-        commit_id = opts[:staged] ? `git write-tree`.chomp : "HEAD"
+        commit_id = staged? ? `git write-tree`.chomp : "HEAD"
         system "git archive --format=zip #{commit_id} > #{tmp_file.path}"
       end
       return tmp_file
@@ -48,27 +54,35 @@ module Rebi
     end
 
     # Create zip archivement
-    def gen env_conf,opts={}
+    def gen
       log("Creating zip archivement", env_conf.name)
       start = Time.now
       ebextensions = env_conf.ebextensions
-      tmp_file = raw_zip_archive opts
+      tmp_file = raw_zip_archive
       tmp_folder = Dir.mktmpdir
       Zip::File.open(tmp_file.path) do |z|
         ebextensions.each do |ex_folder|
-
-          z.remove_folder ex_folder unless ex_folder == ".ebextension"
-          Dir.glob("#{ex_folder}/*.config") do |fname|
+          z.remove_folder ex_folder unless ex_folder == ".ebextensions"
+          Dir.glob("#{ex_folder}/*.config*") do |fname|
             next unless File.file?(fname)
-            next unless y = YAML::load(ErbHelper.new(File.read(fname), env_conf).result)
+
             basename = File.basename(fname)
-            target = ".ebextensions/#{basename}"
-            tmp_yaml = "#{tmp_folder}/#{basename}"
-            File.open(tmp_yaml, 'w') do |f|
-              f.write y.to_yaml
+            source_file = fname
+
+            if fname.match(/\.erb$/)
+              next unless y = YAML::load(ErbHelper.new(File.read(fname), env_conf).result)
+              basename = basename.gsub(/\.erb$/,'')
+              source_file = "#{tmp_folder}/#{basename}"
+              File.open(source_file, 'w') do |f|
+                f.write y.to_yaml
+              end
             end
+
+            target = ".ebextensions/#{basename}"
+
             z.remove target if z.find_entry target
-            z.add target, tmp_yaml
+            z.remove fname if z.find_entry fname
+            z.add target, source_file
           end
         end
         dockerrun_file = env_conf.dockerrun || "Dockerrun.aws.json"
@@ -87,8 +101,6 @@ module Rebi
       end
 
       FileUtils.rm_rf tmp_folder
-
-
       log("Zip was created in: #{Time.now - start}s", env_conf.name)
       return {
         label: Time.now.strftime("app_#{env_conf.name}_#{version_label}_%Y%m%d_%H%M%S"),
@@ -99,7 +111,7 @@ module Rebi
 
     def ebignore_spec
       if ebignore?
-        path_spec = PathSpec.from_filename(EB_IGNORE)
+        path_spec = PathSpec.from_filename(ebignore)
         path_spec.add(".git")
         return path_spec
       else
@@ -108,9 +120,12 @@ module Rebi
     end
 
     def ebignore?
-      File.exist?(EB_IGNORE)
+      File.exist?(ebignore)
     end
 
+    def ebignore
+      env_conf.ebignore
+    end
   end
 end
 

data/sample/rebi.yml

@@ -37,12 +37,12 @@ stages: #Required: Hash
                                         #   - web_extensions
                                         #   - web1_extensions
                                         # Result will has 01.config, 02.config(from web1_extensions) and 03.config
-      cfg_file: File path or cfg name   # Optional
 
       dockerrun: Dockerrun.aws.json.stg # Dockerrun file
       options: #Hash, Other custom options for using in erb
         use_basic: true # rebi.opts.use_basic
 
+      ebignore: .ebignore_web #Optional
       hooks:
         pre: ls # String or Array, run before upload source bundle
         post: ls # String or Array, run right after sending deploy request

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rebi
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - KhiemNS
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-20 00:00:00.000000000 Z
+date: 2018-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -195,10 +195,12 @@ files:
 - lib/rebi/application.rb
 - lib/rebi/config.rb
 - lib/rebi/config_environment.rb
+- lib/rebi/eb.rb
 - lib/rebi/ec2.rb
 - lib/rebi/environment.rb
 - lib/rebi/erb_helper.rb
 - lib/rebi/error.rb
+- lib/rebi/init_service.rb
 - lib/rebi/log.rb
 - lib/rebi/version.rb
 - lib/rebi/zip_helper.rb