conjur-cli 4.28.0 → 4.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8e6ae515f092a2c41963452c0a2fcc0aa8ec0f2c
-  data.tar.gz: 0ecbfa2d23e3dcc763afa1be03e978b709c515c0
+  metadata.gz: 1fa1d02d354078c3b74ddc346be49d07e84681c6
+  data.tar.gz: 1e65f0dddc2fb55dcae4afcf0cce470a89671dda
 SHA512:
-  metadata.gz: f587e417fdcb8a9f0832ce3682706e4363cf8a3b69c3e14eb965ffdff84f157c7578387dd9f5e8c860eb5fcd912d6e263ee28b71d6961c1015f45a64a70a4c0b
-  data.tar.gz: 558101ef2d363276511d821b217563ffaec1595b0c1799a4f785e3eec7663aec40a95d5fec8f20fc8d12ca19e21a680c5a96ffae194c4849b1433ab53fc3d10d
+  metadata.gz: 9a30df7c0d8e0a9bd82002f9e00a43c96cb9adf054a417b4b2b1c190bede3e50799930f645cb0f34e75ac34bb1111ec4d02afdd8b0ab4088b77fcbe8bd7740dc
+  data.tar.gz: d9bea26c97e7d92700e0082df19f04e43a2e9d1353537c5d9bf3e9172ff0b1d4877b7512f033cc0b92d3772d0fde3e86fdd521d343aa92bf4db43f3452be5ab4

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+# 4.28.1
+* Add `--collection` option for `conjur script execute`. Scripts are now portable across environments, like policies.
+
 # 4.28.0
 * Add `conjur policy retire` to allow retiring a policy.
 * Fix `--as-group` and `--as-role` options for `conjur policy load`. Either can now be used to specify ownership of the policy.

data/lib/conjur/command/script.rb

@@ -18,8 +18,27 @@
 # IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
+require 'conjur/command/dsl_command'
+
+require 'etc'
+require 'socket'
 
 class Conjur::Command::Script < Conjur::DSLCommand
+  class << self
+    def default_collection_user
+      # More accurate than Etc.getlogin
+      Etc.getpwuid(Process.uid).name
+    end
+
+    def default_collection_hostname
+      Socket.gethostname
+    end
+
+    def default_collection_name
+      [ default_collection_user, default_collection_hostname ].join('@')
+    end
+  end
+
   desc "Execute Conjur DSL scripts"
   command :script do |script|
     script.desc "Run a Conjur DSL script"
@@ -27,12 +46,24 @@ class Conjur::Command::Script < Conjur::DSLCommand
     script.command :execute do |c|
       acting_as_option(c)
 
+      c.desc "Script collection (target environment)"
+      c.arg_name "collection"
+      c.default_value default_collection_name
+      c.flag [:collection]
+
+
       c.desc "Load context from this config file, and save it when finished. The file permissions will be 0600 by default."
       c.arg_name "FILE"
       c.flag [:c, :context]
 
       c.action do |global_options,options,args|
-        run_script args, options
+        collection = options[:collection] || default_collection_name
+
+        run_script args, options do |runner, &block|
+          runner.scope collection do
+            block.call
+          end
+        end
       end
     end
   end

data/lib/conjur/version.rb

@@ -19,6 +19,6 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = "4.28.0"
+  VERSION = "4.28.1"
   ::Version=VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.28.0
+  version: 4.28.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-20 00:00:00.000000000 Z
+date: 2015-11-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport