jack-eb 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dc83fe99fffa027536020c3af625b3c913689a4f
-  data.tar.gz: e50d09ae4262c8a8773e0998dc89ab8c38e5f35f
+  metadata.gz: ba4de20f714331851a67992e8cbb3ddc5e2cea89
+  data.tar.gz: b545d2eaff2496ca3c506c8707ef4cd75e4ca143
 SHA512:
-  metadata.gz: 2f129606547e21227dca1ade82c18ef6503c95a867745d9b4f9be4b1e6047c74d5d8e0b065a2392e0c3e239f46f45c197a31c21f1c0e50f28029f1ba94198669
-  data.tar.gz: dea17503021a938ed10515d8be103f5201828594fba59c77a5a0c075ab32b8d2947e0545cc09a97130029a46594290deb490aef08d62cf0fc1115f40ac391eb7
+  metadata.gz: 2328f1cfefc1c29483d7ae00f46fc2d21bffb9406d5c5d64df76a6a1352669c6ed26859ffb762aa35b3bc146ea33385ea19093a733c723c120703566bcb03e2f
+  data.tar.gz: 8289fb3aa1a99504edd6ac8e89032b73a2a8712c5b19e7e6419c6fb835bdce42fa2ae0ea9095ae32549901e24b1684c343440f63e18a1a66f4aa81fdefe186bb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jack-eb (0.0.1)
+    jack-eb (0.0.3)
       aws-sdk (~> 2)
       colorize
       thor
@@ -9,15 +9,15 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    aws-sdk (2.0.29)
-      aws-sdk-resources (= 2.0.29)
-    aws-sdk-core (2.0.29)
+    aws-sdk (2.0.28)
+      aws-sdk-resources (= 2.0.28)
+    aws-sdk-core (2.0.28)
       builder (~> 3.0)
       jmespath (~> 1.0)
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
-    aws-sdk-resources (2.0.29)
-      aws-sdk-core (= 2.0.29)
+    aws-sdk-resources (2.0.28)
+      aws-sdk-core (= 2.0.28)
     builder (3.2.2)
     celluloid (0.16.0)
       timers (~> 4.0.0)

data/lib/jack.rb

@@ -7,6 +7,8 @@ require File.expand_path("../jack/ext/hash", __FILE__)
 module Jack
   autoload :CLI, 'jack/cli'
   autoload :Create, 'jack/create'
+  autoload :CreateYaml, 'jack/create_yaml'
+  autoload :EbConfig, 'jack/eb_config'
   autoload :Config, 'jack/config'
   autoload :UI, 'jack/ui'
   autoload :Util, 'jack/util'

data/lib/jack/config/download.rb

@@ -12,7 +12,7 @@ module Jack
         super
         @current_path = "#{@saved_configs}/current-#{timestamp}.cfg.yml"
         @current_name = extract_name(@current_path)
-        sync_eb_config_yml
+        EbConfig::Update.new(env_name: @env_name).sync unless options[:noop]
       end
 
       def run

data/lib/jack/config/transmit.rb

@@ -11,7 +11,7 @@ module Jack
         @options = options
         @root = options[:root] || '.'
         @env_name = options[:env_name]
-        @app_name = @options[:app_name] || app_name_convention(@env_name)
+        @app_name = @options[:app] || app_name_convention(@env_name)
 
         @saved_configs = "#{@root}/.elasticbeanstalk/saved_configs"
 
@@ -19,46 +19,6 @@ module Jack
         @local_config_path = "jack/cfg/#{local_config_name}.cfg.yml"
       end
 
-      def eb_config_path
-        "#{@root}/.elasticbeanstalk/config.yml"
-      end
-
-      def sync_eb_config_yml(force=false)
-        # should break out to another class but too much work right now
-        create = Create.new(@options)
-        create.ensure_eb_init
-        do_sync_eb_config_yml(force)
-      end
-
-    private
-
-      # force flag for specs
-      def do_sync_eb_config_yml(force)
-        return if @options[:noop] and !force
-        envs = describe_environments
-        env = envs[:environments].first
-        if env
-          write_eb_config_yml(env.application_name, env.solution_stack_name)
-        else
-          UI.say "#{@env_name} could not be found".colorize(:red)
-          exit 0
-        end
-      end
-
-      def write_eb_config_yml(application_name, solution_stack_name)
-        data = YAML.load_file(eb_config_path)
-        data['global']['application_name'] = application_name
-        data['global']['default_platform'] = solution_stack_name
-        dump = YAML.dump(data).gsub("!ruby/object:Hash", '')
-        dump = dump.split("\n")[1..-1].join("\n") # strip first line
-        File.write(eb_config_path, dump)
-      end
-
-      # useful for specs
-      def describe_environments
-        eb.describe_environments(environment_names: [@env_name])
-      end
-
       def config_name_convention(env_name)
         env_name.split('-')[0..-2].join('-')
       end

data/lib/jack/config/upload.rb

@@ -88,10 +88,6 @@ EOL
         FileUtils.rm_f(@upload_path)
       end
 
-      def ensure_folder_exist(folder)
-        FileUtils.mkdir_p(folder) unless File.exist?(folder)
-      end
-
     end
   end
 end

data/lib/jack/create.rb

@@ -8,44 +8,14 @@ module Jack
       @options = options
       @root = options[:root] || '.'
       @env_name = options[:env_name]
-      @app_name = options[:app_name] || app_name_convention(@env_name)
-      @upload = Config::Upload.new(@options)
+      @app_name = options[:app] || app_name_convention(@env_name)
     end
 
     def run
-      ensure_eb_init
+      EbConfig::Create.new(@options).sync unless @options[:noop]
       create_env
     end
 
-    def ensure_eb_init
-      if app_name_mismatch
-        do_cmd(%Q|eb init -p "#{platform}" "#{@app_name}"|, @options)
-      end
-    end
-
-    def app_name_mismatch
-      return true unless File.exist?("#{@root}/.elasticbeanstalk/config.yml")
-      return if @options[:noop]
-      eb_config_path = @upload.eb_config_path
-      data = YAML.load_file(eb_config_path)
-      application_name = data['global']['application_name']
-      application_name != @app_name
-    end
-
-    def platform
-      create_yaml['platform'] || latest_docker_platform
-    end
-
-    def latest_docker_platform
-      return if @options[:noop] # for cli spec
-      solution_stacks.grep(/Docker/).reject {|x| x =~ /Preconfigured/}.sort.last
-    end
-
-    # for specs
-    def solution_stacks
-      eb.list_available_solution_stacks.solution_stacks
-    end
-
     def create_env
       command = build_command
       do_cmd(command, @options)
@@ -53,26 +23,12 @@ module Jack
 
     def build_command
       @cfg = upload_cfg
-      flags = create_yaml.inject("") {|s,(k,v)| s << %{--#{k} "#{v}" } ; s }.strip
+      flags = CreateYaml.new.flags
       "eb create --nohang #{flags} #{@cfg}#{cname}#{@env_name}"
     end
 
-    def create_yaml
-      return @create_yaml if @create_yaml
-
-      project_file = "#{@root}/jack/create.yml"
-      project = File.exist?(project_file) ? YAML.load_file(project_file) : {}
-
-      user_file = "#{ENV['HOME']}/.jack/create.yml"
-      user = File.exist?(user_file) ? YAML.load_file(user_file) : {}
-
-      default_file = File.expand_path("../default/create.yml", __FILE__)
-      default = YAML.load_file(default_file)
-
-      @create_yaml = default.merge(project.merge(user))
-    end
-
     def upload_cfg
+      @upload = Config::Upload.new(@options.merge(skip_sync: true))
       if @upload.local_cfg_exist?
         @upload.upload 
         cfg = "--cfg #{@upload.upload_name} "

data/lib/jack/create_yaml.rb

@@ -0,0 +1,22 @@
+module Jack
+  class CreateYaml
+    def data
+      return @create_yaml if @create_yaml
+
+      project_file = "#{@root}/jack/create.yml"
+      project = File.exist?(project_file) ? YAML.load_file(project_file) : {}
+
+      user_file = "#{ENV['HOME']}/.jack/create.yml"
+      user = File.exist?(user_file) ? YAML.load_file(user_file) : {}
+
+      default_file = File.expand_path("../default/create.yml", __FILE__)
+      default = YAML.load_file(default_file)
+
+      @create_yaml = default.merge(project.merge(user))
+    end
+
+    def flags
+      data.inject("") {|s,(k,v)| s << %{--#{k} "#{v}" } ; s }.strip
+    end
+  end
+end

data/lib/jack/eb_config.rb

@@ -0,0 +1,9 @@
+require 'fileutils'
+
+module Jack
+  module EbConfig
+    autoload :Base, 'jack/eb_config/base'
+    autoload :Update, 'jack/eb_config/update'
+    autoload :Create, 'jack/eb_config/create'
+  end
+end

data/lib/jack/eb_config/base.rb

@@ -0,0 +1,38 @@
+module Jack
+  module EbConfig
+    # Abstract Class
+    # Concrete classes should implement methods: platform and app_name
+    class Base
+      include Util
+
+      attr_reader :eb_config_path
+      def initialize(options={})
+        @options = options
+        @root = options[:root] || '.'
+        @env_name = options[:env_name]
+        @eb_config_path = "#{@root}/.elasticbeanstalk/config.yml"
+        ensure_folder_exist(@eb_config_path)
+      end
+
+      def sync
+        ensure_eb_init
+        write_eb_config_yml
+      end
+
+      def ensure_eb_init
+        unless File.exist?(eb_config_path)
+          do_cmd(%Q|eb init -p "#{platform}" "#{app_name}"|, @options)
+        end
+      end
+
+      def write_eb_config_yml
+        data = YAML.load_file(eb_config_path)
+        data['global']['application_name'] = app_name
+        data['global']['default_platform'] = platform
+        dump = YAML.dump(data).gsub("!ruby/object:Hash", '')
+        dump = dump.split("\n")[1..-1].join("\n") # strip first line
+        File.write(eb_config_path, dump)
+      end
+    end
+  end
+end

data/lib/jack/eb_config/create.rb

@@ -0,0 +1,28 @@
+module Jack
+  module EbConfig
+    class Create < Base
+      attr_reader :eb_config_path
+      def initialize(options={})
+        super
+        @app_name = options[:app] || app_name_convention(@env_name)
+      end
+
+      def platform
+        CreateYaml.new.data['platform'] || latest_docker_platform
+      end
+
+      def app_name
+        @app_name
+      end
+
+      def latest_docker_platform
+        solution_stacks.grep(/Docker/).reject {|x| x =~ /Preconfigured/}.sort.last
+      end
+   
+      def solution_stacks
+        eb.list_available_solution_stacks.solution_stacks
+      end
+
+    end
+  end
+end

data/lib/jack/eb_config/update.rb

@@ -0,0 +1,29 @@
+module Jack
+  module EbConfig
+    class Update < Base
+      attr_reader :eb_config_path
+      def initialize(options={})
+        super
+      end
+
+      def platform
+        env.solution_stack_name
+      end
+
+      def app_name
+        env.application_name
+      end
+   
+      def env
+        return @env if @env
+        envs = describe_environments
+        @env = envs[:environments].first
+      end
+
+      # useful for specs
+      def describe_environments
+        eb.describe_environments(environment_names: [@env_name])
+      end
+    end
+  end
+end

data/lib/jack/util.rb

@@ -16,5 +16,9 @@ module Jack
       @@eb ||= Aws::ElasticBeanstalk::Client.new(region: region)
     end
 
+    def ensure_folder_exist(folder)
+      FileUtils.mkdir_p(folder) unless File.exist?(folder)
+    end
+
   end
 end

data/lib/jack/version.rb

@@ -1,3 +1,3 @@
 module Jack
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/lib/config/transmit_spec.rb

@@ -1,41 +1,26 @@
 require 'spec_helper'
-require 'ostruct'
 
 describe Jack::Config do
   before(:all) do
     Jack::UI.mute = true
-    fake_eb_config
   end
 
   let(:transmit) { Jack::Config::Transmit.new(test_options) }
 
-  def fake_eb_config
-      input = <<-EOL
---- 
-global:
-  application_name: blah
-  default_platform: 64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3
-EOL
-      file = "#{@root}/.elasticbeanstalk/config.yml"
-      File.open(file, 'w') { |file| file.write(input) }
-  end
-
-  def mock
-    {environments: [OpenStruct.new(
-      application_name: "myapp", 
-      solution_stack_name: "my solution stack")]}
-  end
-
   describe "transmit" do
-    it "sync_eb_config_yml" do
-      expect(transmit).to receive(:describe_environments).and_return(mock)
-      transmit.sync_eb_config_yml(true)
+    it "config_name_convention" do
+      name = transmit.config_name_convention("stag-rails-app-s9")
+      expect(name).to eq "stag-rails-app"
+    end
 
-      data = YAML.load_file(transmit.eb_config_path)
-      global = data['global']
-      expect(global['application_name']).to eq "myapp"
-      expect(global['default_platform']).to eq "my solution stack"
+    it "timestamp" do
+      timestamp = transmit.timestamp
+      expect(timestamp).to be_a(String)
     end
 
+    it "extract_name" do
+      name = transmit.extract_name("/app/.elasticbeanstalk/saved_cofnigs/stag-rails-app.cfg.yml")
+      expect(name).to eq "stag-rails-app"
+    end
   end
 end

data/spec/lib/create_spec.rb

@@ -5,10 +5,6 @@ describe Jack::Create do
     @create = Jack::Create.new(test_options)
   end
 
-  def solution_stacks
-    ["64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3", "64bit Amazon Linux 2014.03 v1.0.0 running Docker 1.0.0", "64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0", "64bit Amazon Linux 2014.03 v1.0.4 running Docker 0.9.0", "64bit Amazon Linux 2014.03 v1.0.5 running Docker 0.9.0", "64bit Debian jessie v1.2.0 running Go 1.3 (Preconfigured - Docker)", "64bit Debian jessie v1.2.0 running Go 1.4 (Preconfigured - Docker)"]
-  end
-
   describe "jack" do
     it "create environment" do
       command = @create.build_command
@@ -19,16 +15,5 @@ describe Jack::Create do
       expect(command).to include('--cfg stag-rails-app')
       expect(command).to include('stag-rails-app-s9')
     end
-
-    it "create_yaml" do
-      data = @create.create_yaml
-      expect(data["keyname"]).to eq "default"
-    end
-
-    it "list solution stacks" do
-      @create = Jack::Create.new(test_options.merge(noop: false))
-      expect(@create).to receive(:solution_stacks).and_return(solution_stacks)
-      expect(@create.latest_docker_platform).to eq "64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3"
-    end
   end
 end

data/spec/lib/create_yaml_spec.rb

@@ -0,0 +1,17 @@
+require 'spec_helper'
+
+describe Jack::CreateYaml do
+  before(:all) do
+    Jack::UI.mute = true
+  end
+
+  let(:create_yaml) { 
+    Jack::CreateYaml.new
+  }
+
+  describe "create" do
+    it "flags" do
+      expect(create_yaml.flags).to eq('--keyname "default"')
+    end
+  end
+end

data/spec/lib/eb_config/create_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+describe Jack::EbConfig do
+  before(:all) do
+    Jack::UI.mute = true
+    fake_eb_config
+  end
+
+  def solution_stacks
+    ["64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3", "64bit Amazon Linux 2014.03 v1.0.0 running Docker 1.0.0", "64bit Amazon Linux 2014.03 v1.0.1 running Docker 1.0.0", "64bit Amazon Linux 2014.03 v1.0.4 running Docker 0.9.0", "64bit Amazon Linux 2014.03 v1.0.5 running Docker 0.9.0", "64bit Debian jessie v1.2.0 running Go 1.3 (Preconfigured - Docker)", "64bit Debian jessie v1.2.0 running Go 1.4 (Preconfigured - Docker)"]
+  end
+
+  let(:create) { 
+    Jack::EbConfig::Create.new(test_options)
+  }
+
+  describe "create" do
+    it "sync config" do
+      expect(create).to receive(:solution_stacks).and_return(solution_stacks)
+      create.sync
+
+      data = YAML.load_file(create.eb_config_path)
+      global = data['global']
+      expect(global['application_name']).to eq "rails"
+      expect(global['default_platform']).to eq "64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3"
+    end
+
+    it "list solution stacks" do
+      expect(create).to receive(:solution_stacks).and_return(solution_stacks)
+      expect(create.latest_docker_platform).to eq "64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3"
+    end
+  end
+end

data/spec/lib/eb_config/update_spec.rb

@@ -0,0 +1,31 @@
+require 'spec_helper'
+
+describe Jack::EbConfig do
+  before(:all) do
+    Jack::UI.mute = true
+  end
+
+  def mock
+    {environments: [OpenStruct.new(
+      application_name: "myapp", 
+      solution_stack_name: "my solution stack")]}
+  end
+
+  let(:update) { 
+    Jack::EbConfig::Update.new(test_options)
+  }
+
+  describe "update" do
+    it "sync config" do
+      expect(update).to receive(:describe_environments).and_return(mock)
+      update.sync
+
+      data = YAML.load_file(update.eb_config_path)
+      global = data['global']
+      expect(global['application_name']).to eq "myapp"
+      expect(global['default_platform']).to eq "my solution stack"
+    end
+
+  end
+end
+

data/spec/spec_helper.rb

@@ -4,6 +4,7 @@ require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
 require "pp"
+require 'ostruct'
  
 root = File.expand_path('../../', __FILE__)
 require "#{root}/lib/jack"
@@ -25,6 +26,18 @@ module Helpers
       env_name: "stag-rails-app-s9"
     }
   end
+
+  def fake_eb_config
+      data = <<-EOL
+--- 
+global:
+  application_name: blah
+  default_platform: 64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3
+EOL
+      path = "#{@root}/.elasticbeanstalk/config.yml"
+      File.write(path, data) unless File.exist?(path)
+  end
+
 end
 
 RSpec.configure do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jack-eb
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-05 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -152,7 +152,12 @@ files:
 - lib/jack/config/upload.rb
 - lib/jack/config/yaml_formatter.rb
 - lib/jack/create.rb
+- lib/jack/create_yaml.rb
 - lib/jack/default/create.yml
+- lib/jack/eb_config.rb
+- lib/jack/eb_config/base.rb
+- lib/jack/eb_config/create.rb
+- lib/jack/eb_config/update.rb
 - lib/jack/ext/hash.rb
 - lib/jack/ui.rb
 - lib/jack/util.rb
@@ -169,6 +174,9 @@ files:
 - spec/lib/config/yaml_formatter_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/create_spec.rb
+- spec/lib/create_yaml_spec.rb
+- spec/lib/eb_config/create_spec.rb
+- spec/lib/eb_config/update_spec.rb
 - spec/lib/verison_checker_spec.rb
 - spec/spec_helper.rb
 homepage: ''
@@ -207,5 +215,8 @@ test_files:
 - spec/lib/config/yaml_formatter_spec.rb
 - spec/lib/config_spec.rb
 - spec/lib/create_spec.rb
+- spec/lib/create_yaml_spec.rb
+- spec/lib/eb_config/create_spec.rb
+- spec/lib/eb_config/update_spec.rb
 - spec/lib/verison_checker_spec.rb
 - spec/spec_helper.rb