conjur-cli 4.7.5 → 4.8.0

data/Gemfile

@@ -3,14 +3,15 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in conjur.gemspec
 gemspec
 
-gem 'conjur-api', git: 'https://github.com/inscitiv/api-ruby.git', branch: 'master'
+gem 'conjur-api', git: 'https://github.com/conjurinc/api-ruby.git', branch: 'master'
+
 group :test, :development do
   gem 'pry'
 end
 
 group :development do
-  gem 'conjur-asset-environment-api'
-  gem 'conjur-asset-key-pair-api'
-  gem 'conjur-asset-layer-api'
+  gem 'conjur-asset-environment-api', git: 'git@github.com:inscitiv/conjur-asset-environment', branch: 'master'
+  gem 'conjur-asset-key-pair-api', git: 'git@github.com:conjurinc/conjur-asset-key-pair', branch: 'master'
+  gem 'conjur-asset-layer-api', git: 'git@github.com:conjurinc/conjur-asset-layer', branch: 'master'
   gem 'conjur-asset-ui-api', git: 'git@github.com:conjurinc/conjur-asset-ui', branch: 'master'
 end

data/lib/conjur/command.rb

@@ -50,6 +50,63 @@ module Conjur
         command.arg_name 'Perform all actions as the specified Role'
         command.flag [:"as-role"]
       end
+      
+      def command_options_for_list(c)
+        c.desc "Role to act as. By default, the current logged-in role is used."
+        c.flag [:role]
+    
+        c.desc "Full-text search on resource id and annotation values" 
+        c.flag [:s, :search]
+        
+        c.desc "Maximum number of records to return"
+        c.flag [:l, :limit]
+        
+        c.desc "Offset to start from"
+        c.flag [:o, :offset]
+        
+        c.desc "Show only ids"
+        c.switch [:i, :ids]
+        
+        c.desc "Show annotations in 'raw' format"
+        c.switch [:r, :"raw-annotations"]
+      end
+      
+      def command_impl_for_list(global_options, options, args)
+        opts = options.slice(:search, :limit, :options, :kind) 
+        opts[:acting_as] = options[:role] if options[:role]
+        resources = api.resources(opts)
+        if options[:ids]
+          puts resources.map(&:resourceid)
+        else
+          resources = resources.map &:attributes
+          unless options[:'raw-annotations']
+            resources = resources.map do |r|
+              r['annotations'] = (r['annotations'] || []).inject({}) do |hash, annot|
+                hash[annot['name']] = annot['value']
+                hash
+              end
+              r
+            end
+          end
+          puts JSON.pretty_generate resources
+        end
+      end
+        
+      
+      def display_members(members, options)
+        result = if options[:V]
+          members.collect {|member|
+            {
+              member: member.member.roleid,
+              grantor: member.grantor.roleid,
+              admin_option: member.admin_option
+            }
+          }
+        else
+          members.map(&:member).map(&:roleid)
+        end
+        display result
+      end
 
       def display(obj, options = {})
         str = if obj.respond_to?(:attributes)

data/lib/conjur/command/groups.rb

@@ -37,6 +37,37 @@ class Conjur::Command::Groups < Conjur::Command
     end
   end
 
+  desc "List groups"
+  command :list do |c|
+    command_options_for_list c
+
+    c.action do |global_options, options, args|
+      command_impl_for_list global_options, options.merge(kind: "group"), args
+    end
+  end
+
+  desc "Show a group"
+  arg_name "id"
+  command :show do |c|
+    c.action do |global_options,options,args|
+      id = require_arg(args, 'id')
+      display(api.group(id), options)
+    end
+  end
+
+  desc "Lists all direct members of the group. The membership list is not recursively expanded."
+  arg_name "group"
+  command "members" do |c|
+    c.desc "Verbose output"
+    c.switch [:V,:verbose]
+
+    c.action do |global_options,options,args|
+      group = require_arg(args, 'group')
+      
+      display_members api.group(group).role.members, options
+    end
+  end
+
   desc "Add a new group member"
   arg_name "group member"
   command :"members:add" do |c|

data/lib/conjur/command/hosts.rb

@@ -25,7 +25,7 @@ class Conjur::Command::Hosts < Conjur::Command
   self.prefix = :host
 
   desc "Create a new host"
-  arg_name "host"
+  arg_name "id"
   command :create do |c|
     c.arg_name "password"
     c.flag [:p,:password]
@@ -35,10 +35,33 @@ class Conjur::Command::Hosts < Conjur::Command
     c.action do |global_options,options,args|
       id = args.shift
       options[:id] = id if id
+
+      unless id
+        ActiveSupport::Deprecation.warn "id argument will be required in future releases"
+      end
+      
       display api.create_host(options), options
     end
   end
   
+  desc "Show a host"
+  arg_name "id"
+  command :show do |c|
+    c.action do |global_options,options,args|
+      id = require_arg(args, 'id')
+      display(api.host(id), options)
+    end
+  end
+
+  desc "List hosts"
+  command :list do |c|
+    command_options_for_list c
+
+    c.action do |global_options, options, args|
+      command_impl_for_list global_options, options.merge(kind: "host"), args
+    end
+  end
+  
   desc "Enroll a new host into conjur"
   arg_name "host"
   command :enroll do |c|

data/lib/conjur/command/resources.rb

@@ -165,46 +165,13 @@ class Conjur::Command::Resources < Conjur::Command
   
   desc "List all resources"
   command :list do |c| 
-    c.desc "Role to act as. By default, the current logged-in role is used."
-    c.flag [:role]
-
     c.desc "Filter by kind"
     c.flag [:k, :kind]
     
-    c.desc "Full-text search on resource id and annotation values" 
-    c.flag [:s, :search]
-    
-    c.desc "Maximum number of records to return"
-    c.flag [:l, :limit]
-    
-    c.desc "Offset to start from"
-    c.flag [:o, :offset]
-    
-    c.desc "Show only ids"
-    c.switch [:i, :ids]
-    
-    c.desc "Show annotations in 'raw' format"
-    c.switch [:r, :"raw-annotations"]
-    
+    command_options_for_list c
+
     c.action do |global_options, options, args| 
-      opts = options.slice(:search, :limit, :options, :kind) 
-      opts[:acting_as] = options[:role] if options[:role]
-      resources = api.resources(opts)
-      if options[:ids]
-        puts resources.map(&:resourceid)
-      else
-        resources = resources.map &:attributes
-        unless options[:'raw-annotations']
-          resources = resources.map do |r|
-            r['annotations'] = (r['annotations'] || []).inject({}) do |hash, annot|
-              hash[annot['name']] = annot['value']
-              hash
-            end
-            r
-          end
-        end
-        puts JSON.pretty_generate resources
-      end
+      command_impl_for_list global_options, options, args
     end
   end
 end

data/lib/conjur/command/roles.rb

@@ -70,18 +70,7 @@ class Conjur::Command::Roles < Conjur::Command
     
     c.action do |global_options,options,args|
       role = args.shift || api.user(api.username).roleid
-      result = if options[:V]
-        api.role(role).members.collect {|member|
-          {
-            member: member.member.roleid,
-            grantor: member.grantor.roleid,
-            admin_option: member.admin_option
-          }
-        }
-      else
-        api.role(role).members.map(&:member).map(&:roleid)
-      end
-      display result
+      display_members api.role(role).members, options
     end
   end
 

data/lib/conjur/command/users.rb

@@ -59,6 +59,24 @@ class Conjur::Command::Users < Conjur::Command
     end
   end
 
+  desc "Show a user"
+  arg_name "id"
+  command :show do |c|
+    c.action do |global_options,options,args|
+      id = require_arg(args, 'id')
+      display(api.user(id), options)
+    end
+  end
+
+  desc "List users"
+  command :list do |c|
+    command_options_for_list c
+
+    c.action do |global_options, options, args|
+      command_impl_for_list global_options, options.merge(kind: "user"), args
+    end
+  end
+
   desc "Update the password of the logged-in user"
   command :update_password do |c|
     c.desc "Password to use, otherwise you will be prompted"

data/lib/conjur/command/variables.rb

@@ -25,7 +25,7 @@ class Conjur::Command::Variables < Conjur::Command
   self.prefix = :variable
   
   desc "Create and store a variable"
-  arg_name "id?"
+  arg_name "id"
   command :create do |c|
     c.arg_name "mime_type"
     c.flag [:m, :"mime-type"], default_value: "text/plain"
@@ -33,12 +33,20 @@ class Conjur::Command::Variables < Conjur::Command
     c.arg_name "kind"
     c.flag [:k, :"kind"], default_value: "secret"
     
+    c.arg_name "value"
+    c.desc "Initial value"
+    c.flag [:v, :"value"]
+    
     acting_as_option(c)
     
     c.action do |global_options,options,args|
       id = args.shift
       options[:id] = id if id
       
+      unless id
+        ActiveSupport::Deprecation.warn "id argument will be required in future releases"
+      end
+      
       mime_type = options.delete(:m)
       kind = options.delete(:k)
       
@@ -59,6 +67,15 @@ class Conjur::Command::Variables < Conjur::Command
     end
   end
 
+  desc "List variables"
+  command :list do |c|
+    command_options_for_list c
+
+    c.action do |global_options, options, args|
+      command_impl_for_list global_options, options.merge(kind: "variable"), args
+    end
+  end
+  
   desc "Add a value"
   arg_name "variable ( value | STDIN )"
   command :"values:add" do |c|

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.7.5"
+  VERSION = "4.8.0"
   ::Version=VERSION
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.7.5
+  version: 4.8.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-27 00:00:00.000000000 Z
+date: 2014-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: conjur-api
@@ -258,7 +258,6 @@ files:
 - lib/conjur/command/rspec/mock_services.rb
 - lib/conjur/command/rspec/output_matchers.rb
 - lib/conjur/command/script.rb
-- lib/conjur/command/search.rb
 - lib/conjur/command/secrets.rb
 - lib/conjur/command/users.rb
 - lib/conjur/command/variables.rb
@@ -297,18 +296,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1518604036623995460
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1518604036623995460
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25

data/lib/conjur/command/search.rb

@@ -1,34 +0,0 @@
-#
-# Copyright (C) 2014 Conjur Inc
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy of
-# this software and associated documentation files (the "Software"), to deal in
-# the Software without restriction, including without limitation the rights to
-# use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-# the Software, and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-# FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-# COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-# 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/api'
-require 'conjur/command'
-
-class Conjur::Command::Init < Conjur::Command
-  desc "Search through Conjur assets"
-
-  arg_name "pattern"
-  Conjur::CLI.command :search do |c|
-    c.action do |global_options,options,args|
-      pattern = args.shift
-      puts api.resources(search: pattern).map {|r| r.resource_id }
-    end
-  end
-end