jack-eb 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 89ef11d5cc261c03016ea406f3a90985588d491c
-  data.tar.gz: a8a7d7003b408913a83dbff7fb8fafd9d7933eb5
+  metadata.gz: 0b42806f99aa21018cdc2ba15165568982ea5e33
+  data.tar.gz: 45ce60cf95cfc8beea67a41dd604ec90e8121e96
 SHA512:
-  metadata.gz: 65b1a0320df3a79fd4d11ea60ba1a9a5f9b5ee3a15af96891e1522c46bb1410653d9a1b2e9334dd8cc9b63b093927dbc242c8b0aa3eb2f9941a33fa8cc9ecdea
-  data.tar.gz: 49c4370e2097e95f78faff19d9560a2c2fe49777f016a3b7ce6787379713f8d4d87ed99d999c82c84dbd07e41b8ef5b9df4426a7e068ad7c5c797df3685604fe
+  metadata.gz: f81a1908e5f2fd064c6908f90f23c4d80220ce37f8f85ce696202b878b9bbf6b4f59d6abc70d48b09a92cad715998fe96056950712795280cc1e32854d6747f0
+  data.tar.gz: e5245a9d74159e6c4d28c879b2c8bd5a7d95f0630d767b269bf2dea68a4a0dc10e72531ee2d967200517b568490e9190a22a2f69305cff40108a90dc7b15c1fd

data/README.md

@@ -49,7 +49,7 @@ In your project folder create a folder call jack/cfg.  It might be useful for yo
 $ jack config download [ENVIRONMENT_NAME]
 </pre>
 
-The path of config that is saved is based on a convention.  An example best illustrates the convention.
+The path of config that is saved is based on the environment name.
 
 <pre>
 $ jack config download stag-rails-app-s1
@@ -57,13 +57,13 @@ Downloading config file...
 Running: eb config save --cfg current-2015-03-03_18-40-34 stag-rails-app-s1
 
 Configuration saved at: /Users/tung/src/rails/.elasticbeanstalk/saved_configs/current-2015-03-03_18-40-34.cfg.yml
-Writing to local config file: jack/cfg/stag-rails-app.cfg.yml
+Writing to local config file: jack/cfg/stag-rails-app-s1.cfg.yml
 Cleaning up eb remote config and local files
 Config downloaded to jack/cfg/stag-rails-app.cfg.yml
 $ 
 </pre>
 
-Results in a saved jack/cfg/stag-rails-app.cfg.yml template configuration file.  Notice how the last dash separated word has been removed.  The convention is overridable. 
+Results in a saved jack/cfg/stag-rails-app-s1.cfg.yml template configuration file.  This is overridable. 
 
 <pre>
 $ jack config download -c myconfig stag-rails-app-s1
@@ -83,9 +83,9 @@ Configuration templates hold all the options and settings that we can set for an
 The purpose of the jack/cfg configs is allow us to be able to create environments with a codified configuration file that can be versioned controlled.
 
 <pre>
-$ jack create stag-rails-app-s1 # uses the jack/cfg/stag-rails-app.cfg.yml template
-$ jack create stag-rails-app-s2 # another instance of the environment, but still uses the jack/cfg/stag-rails-app.cfg.yml template
-$ jack create -c myconfig stag-rails-app-s3 # creates environment using a config not based on naming convention
+$ jack create stag-rails-app-s1 # uses the jack/cfg/stag-rails-app-s1.cfg.yml template
+$ jack create stag-rails-app-s2 # uses the jack/cfg/stag-rails-app-s1.cfg.yml template
+$ jack create -c myconfig stag-rails-app-s3 # creates environment using a config not based on environment naming convention
 </pre>
 
 If the project is brand new and has never had `eb init` ran on it before.  For example, a project that has just been git cloned.  Then calling any of the jack commands will automatically call `eb init` in the project.  `eb init` requires the platform flag in order to avoid prompting.  By default, the latest Docker solution stack is used for the platform option.  But you can override that by creating an ~/.jack/create.yml or jack/create.yml within the project folder.  Here's an [example](https://gist.github.com/tongueroo/086e3c11c4d00d5c39b6). The options from each file is merged using the following precedence: project folder, user home, default that is packaged with this gem.  Most of the settings that `jack create` should used should be in the template configuration file though.
@@ -100,7 +100,7 @@ To download a template configuration.
 $ jack config download stag-rails-app-s1
 ```
 
-This will save the config to jack/cfg/stag-rails-app.cfg.yml.
+This will save the config to jack/cfg/stag-rails-app-s1.cfg.yml.
 
 #### Upload
 
@@ -110,7 +110,7 @@ To upload a template configuration.
 $ jack config upload stag-rails-app-s1
 ```
 
-This will save the config to jack/cfg/stag-rails-app.cfg.yml.  Here's an example of the [output](http://d.pr/i/14Sfh).
+This will save the config to jack/cfg/stag-rails-app-s1.cfg.yml.  Here's an example of the [output](http://d.pr/i/14Sfh).
 
 Notice that the `eb config upload` command also prompts you with the diff before uploading and ask for confirmation.  You can bypass the prompt with the force option.
 

data/lib/jack/config/download.rb

@@ -21,12 +21,22 @@ module Jack
       end
 
       def download
+        add_gitignore
         get_current_cfg
         copy_to_local_cfg
         clean
         UI.say "Config downloaded to #{@local_config_path}".colorize(:green)
       end
 
+      def add_gitignore
+        path = "#{@root}/.gitignore"
+        if File.exist?(path)
+          ignores = IO.read(path)
+          has_ignore = ignores.include?("jack/cfg")
+        end
+        do_cmd("echo 'jack/cfg/*.yml' >> #{path}") unless has_ignore
+      end
+
       def get_current_cfg
         UI.say "Downloading config file..."
         eb_config_save

data/lib/jack/config/transmit.rb

@@ -15,14 +15,10 @@ module Jack
 
         @saved_configs = "#{@root}/.elasticbeanstalk/saved_configs"
 
-        local_config_name = options[:cfg] || config_name_convention(@env_name)
+        local_config_name = options[:cfg] || @env_name
         @local_config_path = "jack/cfg/#{local_config_name}.cfg.yml"
       end
 
-      def config_name_convention(env_name)
-        env_name.split('-')[0..-2].join('-')
-      end
-
       def timestamp
         Time.now.strftime "%Y-%m-%d_%H-%M-%S"
       end

data/lib/jack/version.rb

@@ -1,3 +1,3 @@
 module Jack
-  VERSION = "0.0.8"
+  VERSION = "0.0.9"
 end

data/spec/lib/config/download_spec.rb

@@ -15,5 +15,11 @@ describe Jack::Config do
       download.download
     end
 
+    it "should add jack/cfg/*.yml to gitignore" do
+      download.download
+      ignore = IO.read("#{@root}/.gitignore")
+      expect(ignore).to include("jack/cfg")
+    end
+
   end
 end

data/spec/lib/config/transmit_spec.rb

@@ -8,18 +8,13 @@ describe Jack::Config do
   let(:transmit) { Jack::Config::Transmit.new(test_options) }
 
   describe "transmit" do
-    it "config_name_convention" do
-      name = transmit.config_name_convention("stag-rails-app-s9")
-      expect(name).to eq "stag-rails-app"
-    end
-
     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")
+      name = transmit.extract_name("/app/.elasticbeanstalk/saved_configs/stag-rails-app.cfg.yml")
       expect(name).to eq "stag-rails-app"
     end
   end

data/spec/spec_helper.rb

@@ -35,6 +35,8 @@ global:
   default_platform: 64bit Amazon Linux 2014.09 v1.2.0 running Docker 1.3.3
 EOL
       path = "#{@root}/.elasticbeanstalk/config.yml"
+      dir = File.dirname(path)
+      FileUtils.mkdir_p(dir) unless File.exist?(path)
       File.write(path, data) unless File.exist?(path)
   end
 
@@ -44,5 +46,9 @@ RSpec.configure do |c|
   c.include Helpers
   c.before :all do
     @root = "spec/fixtures/project"
+    fake_eb_config
+  end
+  c.after :all do
+    FileUtils.rm_f("#{@root}/.gitignore")
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jack-eb
 version: !ruby/object:Gem::Version
-  version: 0.0.8
+  version: 0.0.9
 platform: ruby
 authors:
 - Tung Nguyen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-08 00:00:00.000000000 Z
+date: 2015-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -162,7 +162,7 @@ files:
 - lib/jack/util.rb
 - lib/jack/version.rb
 - lib/jack/version_checker.rb
-- spec/fixtures/project/jack/cfg/stag-rails-app.cfg.yml
+- spec/fixtures/project/jack/cfg/stag-rails-app-s9.cfg.yml
 - spec/lib/cli_spec.rb
 - spec/lib/config/diff_spec.rb
 - spec/lib/config/download_spec.rb
@@ -202,7 +202,7 @@ signing_key:
 specification_version: 4
 summary: Wrapper tool to manage AWS Elastic Beanstalk environments
 test_files:
-- spec/fixtures/project/jack/cfg/stag-rails-app.cfg.yml
+- spec/fixtures/project/jack/cfg/stag-rails-app-s9.cfg.yml
 - spec/lib/cli_spec.rb
 - spec/lib/config/diff_spec.rb
 - spec/lib/config/download_spec.rb