conjur-cli 2.1.8 → 2.1.9

data/Gemfile

@@ -4,7 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'slosilo', git: 'https://github.com/inscitiv/slosilo.git', branch: 'master'
-gem 'conjur-api', '~> 2.2.2', git: 'https://github.com/inscitiv/api-ruby.git', branch: 'master'
+gem 'conjur-api', '~> 2.2', 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'

data/lib/conjur/command.rb

@@ -1,5 +1,7 @@
 module Conjur
   class Command
+    @@api = nil
+    
     class << self
       attr_accessor :prefix
       
@@ -16,7 +18,11 @@ module Conjur
       end
 
       def api
-        Conjur::Authn.connect
+        @@api ||= Conjur::Authn.connect
+      end
+
+      def conjur_account
+        Conjur::Core::API.conjur_account
       end
       
       def acting_as_option(command)

data/lib/conjur/command/ids.rb

@@ -0,0 +1,13 @@
+require 'conjur/command'
+
+class Conjur::Command::Id < Conjur::Command
+  self.prefix = :id
+
+  desc "Creates a new unique id"
+  command :create do |c|
+    c.action do |global_options,options,args|
+      var = api.create_variable("text/plain", "unique-id", {})
+      puts var.id
+    end
+  end
+end

data/lib/conjur/command/resources.rb

@@ -13,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([ Conjur.account, kind, id ].join(':'))
+      resource = api.resource([ conjur_account, kind, id ].join(':'))
       resource.create(options)
     end
   end
@@ -24,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([ Conjur.account, kind, id ].join(':')).attributes
+      display api.resource([ conjur_account, kind, id ].join(':')).attributes
     end
   end
   
@@ -34,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([ Conjur.account, kind, id ].join(':'))
+      resource = api.resource([ conjur_account, kind, id ].join(':'))
       puts resource.exists?
     end
   end
@@ -47,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([ Conjur.account, kind, id ].join(':')).permit privilege, role
+      api.resource([ conjur_account, kind, id ].join(':')).permit privilege, role
     end
   end
 
@@ -59,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([ Conjur.account, kind, id ].join(':')).deny privilege, role
+      api.resource([ conjur_account, kind, id ].join(':')).deny privilege, role
     end
   end
   
@@ -83,7 +83,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([ Conjur.account, kind, id ].join(':')).give_to owner
+      api.resource([ conjur_account, kind, id ].join(':')).give_to owner
     end
   end
 
@@ -94,7 +94,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([ Conjur.account, kind, id ].join(':')).permitted_roles(permission)
+      display api.resource([ conjur_account, kind, id ].join(':')).permitted_roles(permission)
     end
   end
 end

data/lib/conjur/command/roles.rb

@@ -35,12 +35,19 @@ class Conjur::Command::Roles < Conjur::Command
     end
   end
 
-  desc "Lists all members of the role"
+  desc "Lists members of the role"
   arg_name "role"
   command :members do |c|
+    c.desc "List all members recursively"
+    c.switch :a
+
     c.action do |global_options,options,args|
       role = args.shift || api.user(api.username).roleid
-      display api.role(role).members.map(&:member).map(&:roleid)
+      if options[:a]
+        display api.role(role).all.map(&:roleid)
+      else
+        display api.role(role).members.map(&:member).map(&:roleid)
+      end
     end
   end
 

data/lib/conjur/version.rb

@@ -1,3 +1,3 @@
 module Conjur
-  VERSION = "2.1.8"
+  VERSION = "2.1.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 2.1.8
+  version: 2.1.9
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-30 00:00:00.000000000 Z
+date: 2013-06-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: conjur-api
@@ -152,6 +152,7 @@ files:
 - lib/conjur/command/field.rb
 - lib/conjur/command/groups.rb
 - lib/conjur/command/hosts.rb
+- lib/conjur/command/ids.rb
 - lib/conjur/command/resources.rb
 - lib/conjur/command/roles.rb
 - lib/conjur/command/secrets.rb