rcloadenv 0.0.1.rc1 → 0.0.1.rc2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7a87297ed8dee36a3aed034991042cd36fca122b
-  data.tar.gz: 1714fafa57d7e35fe6f5a258a5ffd939f7253bce
+  metadata.gz: c68796040890128ba8d662312d27dfaabcc08c9d
+  data.tar.gz: e9cb3bf736137aa83203289b33c20cfcc655581f
 SHA512:
-  metadata.gz: 3f8cc786c9a142a0d7381488b9d8282d4507bceb9e9b3c14b0b4e0597f6be5dff2ce2dd4590a4b5b2aad093a37dc34f32479dccf73d28f83ff27edb51ebda12d
-  data.tar.gz: 977c7bb995baa901fb36934b4d5f9ec552047d2778d3e7212c207307760748eae840d77d3ea385d70944b1bce34e56b5b2b5fe7546a4f63368bd8c2d9083a128
+  metadata.gz: '09c2518da2e08e37fdac0ec1ceaf768461a5082ce07890a7e8db186bfa0786269096e66e1a731759388f3487b7015f0ed14ade39a8c5e189689cdabfb83bf7cb'
+  data.tar.gz: 21626feb54da19cc9184c72512ada5ff195b7e8b051dc39978d98bbb18f15abcad9843a58c86e945cb9c497d4bc3fa5cb40af32eb59dd4dc3e48891c07c84221

data/README.md

@@ -34,19 +34,19 @@ When not running on GCP, credentials are obtained from
 so you can the `GOOGLE_APPLICATION_CREDENTIALS` environment variable or
 configure `gcloud auth`.
 
-## Example: Loading the Rails SECRET_KEY in Google App Engine
+## Example: Loading the Rails SECRET_KEY_BASE in Google App Engine
 
 This gem is commonly used to provide sensitive information such as API keys or
 database passwords to a Ruby application deployed to Google Cloud Platform,
 without exposing them to configuration files checked into source control.
 
-For example, Rails applications require the environment variable `SECRET_KEY`
-to be set in the production environment. When deploying a Rails application to
-Google App Engine, you could set this environment variable in the "app.yaml"
-configuration file, but that is not recommended because the "app.yaml" file
-is commonly checked into source control. Instead, you can set the `SECRET_KEY`
-value securely in the Runtime Config service, and use `rcloadenv` to load it
-into the Rails app. Here's how.
+For example, Rails applications require the environment variable
+`SECRET_KEY_BASE` to be set in the production environment. When deploying a
+Rails application to Google App Engine, you could set this environment
+variable in the "app.yaml" configuration file, but that is not recommended
+because the "app.yaml" file is commonly checked into source control. Instead,
+you can set the `SECRET_KEY_BASE` value securely in the Runtime Config
+service, and use `rcloadenv` to load it into the Rails app. Here's how.
 
 1.  We will assume that:
 
@@ -86,10 +86,10 @@ into the Rails app. Here's how.
 
     This will generate a random key and print it to the console.
 
-5.  Use the gcloud command line to set the `SECRET_KEY` in your configuration.
+5.  Use the gcloud command line to set `SECRET_KEY_BASE` in your configuration.
 
-        gcloud beta runtime-config configs variables set SECRET_KEY 12345678 \
-          --config-name=my-config
+        gcloud beta runtime-config configs variables set \
+          SECRET_KEY_BASE 12345678 --config-name=my-config
 
     Replace `my-config` with the name of your configuration, and `12345678`
     with the secret key that you generated above.
@@ -109,11 +109,11 @@ into the Rails app. Here's how.
 
     Replace `my-config` with the name of your configuration.
 
-    (If you previously set SECRET_KEY in the env_variables section of your
+    (If you previously set SECRET_KEY_BASE in the env_variables section of your
     app.yaml, remove it. You no longer need it!)
 
     Now when you deploy and run your application, it should load the
-    SECRET_KEY value from your Runtime Configuration.
+    SECRET_KEY_BASE value from your Runtime Configuration.
 
 8.  If you have set any custom build steps for your application that require
     this configuration, make sure you update them too. For example, you might

data/lib/rcloadenv/cli.rb

@@ -33,7 +33,8 @@ module RCLoadEnv
       @include = []
       @override = false
       @debug = false
-      parser = OptionParser.new do |opts|
+
+      @parser = OptionParser.new do |opts|
         opts.banner = "Usage: rcloadenv [options] <config-name> -- <command>"
         opts.on "-p name", "--project=name", "--projectId=name",
                 "Project to read runtime config from" do |p|
@@ -54,17 +55,35 @@ module RCLoadEnv
         opts.on "-d", "--debug", "Enable debug output" do
           @debug = true
         end
-        opts.on "-?", "--help", "Show the help text and exit" do
-          puts parser.help
+        opts.on_tail "--version", "Show the version and exit" do
+          puts RCLoadEnv::VERSION
+          exit
+        end
+        opts.on_tail "-?", "--help", "Show the help text and exit" do
+          puts @parser.help
           exit
         end
       end
-      @command_list = parser.parse args
-      @config_name = @command_list.shift
-      unless @config_name && @command_list.size > 0
-        STDERR.puts "rcloadenv: config name and command are both required."
-        STDERR.puts parser.help
-        exit 1
+
+      separator_index = args.index "--"
+      @command_list = separator_index ? args[(separator_index+1)..-1] : []
+
+      args = args[0..separator_index] if separator_index
+      begin
+        remaining_args = @parser.parse args
+      rescue OptionParser::ParseError => ex
+        usage_error ex.message
+      end
+      @config_name = remaining_args.shift
+      unless @config_name
+        usage_error "You must provide a config name."
+      end
+      unless remaining_args.empty?
+        usage_error "Extra arguments found: #{remaining_args.inspect}"
+      end
+
+      if @command_list.empty?
+        usage_error "You must provide a command delimited by `--`."
       end
     end
 
@@ -79,5 +98,12 @@ module RCLoadEnv
       loader.modify_env ENV
       exec(*@command_list)
     end
+
+    ## @private
+    def usage_error msg
+      STDERR.puts "rcloadenv: #{msg}"
+      STDERR.puts @parser.help
+      exit 1
+    end
   end
 end

data/lib/rcloadenv/version.rb

@@ -16,6 +16,6 @@
 module RCLoadEnv
 
   ## The current version of this gem, as a string.
-  VERSION = '0.0.1.rc1'.freeze
+  VERSION = '0.0.1.rc2'.freeze
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rcloadenv
 version: !ruby/object:Gem::Version
-  version: 0.0.1.rc1
+  version: 0.0.1.rc2
 platform: ruby
 authors:
 - Daniel Azuma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-27 00:00:00.000000000 Z
+date: 2017-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: google-api-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.13'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.13'
 - !ruby/object:Gem::Dependency
   name: google-cloud-core
   requirement: !ruby/object:Gem::Requirement