conjur-cli 2.1.2 → 2.1.3

data/.gitignore

@@ -1,3 +1,4 @@
+testdata/
 *.gem
 *.rbc
 .bundle

data/Gemfile

@@ -3,8 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in conjur.gemspec
 gemspec
 
-gem 'slosilo', git: 'https://github.com/inscitiv/slosilo.git'
+gem 'slosilo', git: 'https://github.com/inscitiv/slosilo.git', branch: 'master'
 gem 'conjur-api', git: 'https://github.com/inscitiv/api-ruby.git', branch: 'master'
+gem 'conjur-asset-cmi-study', git: 'https://inscitiv-ops-dev:Me5aswes@github.com/inscitiv/conjur-asset-cmi-study', branch: 'master'
 gem 'conjur-asset-environment', git: 'https://inscitiv-ops-dev:Me5aswes@github.com/inscitiv/conjur-asset-environment', branch: 'master'
 gem 'conjur-asset-deployment',  git: 'https://inscitiv-ops-dev:Me5aswes@github.com/inscitiv/conjur-asset-deployment',  branch: 'master'
-gem 'conjur-asset-cmi-study',   git: 'https://inscitiv-ops-dev:Me5aswes@github.com/inscitiv/conjur-asset-cmi-study',   branch: 'master'
+gem 'conjur-asset-service-gateway',   git: 'https://inscitiv-ops-dev:Me5aswes@github.com/inscitiv/conjur-asset-service-gateway',   branch: 'master'

data/lib/conjur/cli.rb

@@ -18,8 +18,10 @@ module Conjur
             
     load_config
             
-    ENV['CONJUR_ENV'] = Config[:env] if Config[:env]
+    ENV['CONJUR_ENV'] = Config[:env] || "production"
     ENV['CONJUR_STACK'] = Config[:stack] if Config[:stack]
+    ENV['CONJUR_STACK'] ||= 'v3' if ENV['CONJUR_ENV'] == 'production'
+    ENV['CONJUR_ACCOUNT'] = Config[:account] or raise "Missing configuration setting: account"
     
     Conjur::Config.plugins.each do |plugin|
       require "conjur-asset-#{plugin}"

data/lib/conjur/command/groups.rb

@@ -18,8 +18,7 @@ class Conjur::Command::Groups < Conjur::Command
   end
 
   desc "Add a new group member"
-  arg_name "group"
-  arg_name "member"
+  arg_name "group member"
   command :"members:add" do |c|
     c.desc "Grant with admin option"
     c.switch [:a, :admin]

data/lib/conjur/command/resources.rb

@@ -1,4 +1,5 @@
 require 'conjur/authn'
+require 'conjur/resource'
 require 'conjur/command'
 
 class Conjur::Command::Resources < Conjur::Command
@@ -12,7 +13,7 @@ class Conjur::Command::Resources < Conjur::Command
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
-      resource = api.resource(kind, id)
+      resource = api.resource([ Conjur.account, kind, id ].join(':'))
       resource.create(options)
     end
   end
@@ -23,7 +24,7 @@ class Conjur::Command::Resources < Conjur::Command
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
-      display api.resource(kind, id).attributes
+      display api.resource([ Conjur.account, kind, id ].join(':')).attributes
     end
   end
   
@@ -33,7 +34,7 @@ class Conjur::Command::Resources < Conjur::Command
     c.action do |global_options,options,args|
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
-      resource = api.resource(kind, id)
+      resource = api.resource([ Conjur.account, kind, id ].join(':'))
       puts resource.exists?
     end
   end
@@ -46,7 +47,7 @@ class Conjur::Command::Resources < Conjur::Command
       id = require_arg(args, "resource-id")
       role = require_arg(args, "role")
       privilege = require_arg(args, "privilege")
-      api.resource(kind, id).permit privilege, role
+      api.resource([ Conjur.account, kind, id ].join(':')).permit privilege, role
     end
   end
 
@@ -58,7 +59,7 @@ class Conjur::Command::Resources < Conjur::Command
       id = require_arg(args, "resource-id")
       role = require_arg(args, "role")
       privilege = require_arg(args, "privilege")
-      api.resource(kind, id).deny privilege, role
+      api.resource([ Conjur.account, kind, id ].join(':')).deny privilege, role
     end
   end
 
@@ -69,7 +70,7 @@ class Conjur::Command::Resources < Conjur::Command
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
       owner = require_arg(args, "owner")
-      api.resource(kind, id).give_to owner
+      api.resource([ Conjur.account, kind, id ].join(':')).give_to owner
     end
   end
 
@@ -80,7 +81,7 @@ class Conjur::Command::Resources < Conjur::Command
       kind = require_arg(args, "kind")
       id = require_arg(args, "resource-id")
       permission = require_arg(args, "permission")
-      display api.resource(kind, id).permitted_roles(permission)
+      display api.resource([ Conjur.account, kind, id ].join(':')).permitted_roles(permission)
     end
   end
 end

data/lib/conjur/command/roles.rb

@@ -30,8 +30,17 @@ class Conjur::Command::Roles < Conjur::Command
   arg_name "role"
   command :memberships do |c|
     c.action do |global_options,options,args|
-      role = args.shift || api.username
-      display api.role(role).all.map(&:id)
+      role = args.shift || api.user(api.username).roleid
+      display api.role(role).all.map(&:roleid)
+    end
+  end
+
+  desc "Lists all members of the role"
+  arg_name "role"
+  command :members do |c|
+    c.action do |global_options,options,args|
+      role = args.shift || api.user(api.username).roleid
+      display api.role(role).members.map(&:member).map(&:roleid)
     end
   end
 

data/lib/conjur/command/variables.rb

@@ -30,7 +30,7 @@ class Conjur::Command::Variables < Conjur::Command
   end
 
   desc "Add a value"
-  arg_name "variable value"
+  arg_name "variable ( value | STDIN )"
   command :"values:add" do |c|
     c.action do |global_options,options,args|
       id = require_arg(args, 'variable')

data/lib/conjur/version.rb

@@ -1,3 +1,3 @@
 module Conjur
-  VERSION = "2.1.2"
+  VERSION = "2.1.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.2
+  version: 2.1.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: conjur-api