conjur-cli 4.3.0 → 4.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 873f90a23b9e22be41441f80c9086f5c005137fe
+  data.tar.gz: 7c6d8a46e66a871415dc3085bc28ef6551c30289
+SHA512:
+  metadata.gz: efe1fdb784cd353cbf45d0b60ab4744bc5bdd83c9ee333257e4ca0515b4e486426edd03645a125b349443729c241a18e42966adb773fd11b9ab533a9eab56a01
+  data.tar.gz: 5bec66f78fdccf45d679b2f58a8f4c7cec8e2a65d2bafe116b8e266832b9590fc6c50200278b806b22847664a41a53a03bdd601107bb9fc6a47f74630ac87664

data/.gitignore

@@ -1,3 +1,4 @@
+.conjurrc
 *.cert
 *.credential
 *.json

data/Gemfile

@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'conjur-api', git: 'https://github.com/inscitiv/api-ruby.git', branch: 'master'
+
+group :test, :development do
+  gem 'pry'
+end

data/features/support/hooks.rb

@@ -62,8 +62,6 @@ class MockAPI
   protected
   
   def create_thing(kind, id, options, kind_options = {})
-    p kind, id, options, kind_options
-    
     thing = OpenStruct.new(kind: kind, id: id, exists?: true)
     
     class << thing

data/lib/conjur/cli.rb

@@ -83,7 +83,7 @@ module Conjur
       end
       
       if Conjur.log
-        Conjur.log << "error: #{exception}\n#{exception.backtrace rescue 'NO BACKTRACE?'}"
+        Conjur.log << "error: #{exception}\n#{exception.backtrace.join("\n") rescue 'NO BACKTRACE?'}"
       end
       true
     end

data/lib/conjur/command/rspec/describe_command.rb

@@ -0,0 +1,11 @@
+module RSpec::Core::DSL
+  def describe_command *argv, &block
+    describe *argv do
+      let(:invoke) do
+        Conjur::CLI.error_device = $stderr
+        Conjur::CLI.run argv.first.split(' ')
+      end
+      instance_eval &block
+    end
+  end
+end

data/lib/conjur/command/rspec/helpers.rb

@@ -0,0 +1,3 @@
+require 'conjur/command/rspec/describe_command'
+require 'conjur/command/rspec/output_matchers'
+require 'conjur/command/rspec/mock_services'

data/lib/conjur/command/rspec/mock_services.rb

@@ -0,0 +1,40 @@
+shared_context "with fake endpoints and test config" do
+  let(:authn_host) { 'https://authn.example.com' }
+  let(:authz_host) { 'https://authz.example.com' }
+  let(:core_host) { 'https://core.example.com' }
+  before do
+    Conjur::Authn::API.stub host: authn_host
+    Conjur::Authz::API.stub host: authz_host
+    Conjur::Core::API.stub host: core_host
+
+    ENV['GLI_DEBUG'] = 'true'
+  end
+end
+
+shared_context "with mock authn" do
+  include_context "with fake endpoints and test config"
+  let(:netrcfile) { Tempfile.new 'authtest' }
+  let(:netrc) { Netrc.read(netrcfile.path) }
+  let(:account) { 'the-account' }
+  before do
+    Conjur::Core::API.stub conjur_account: account
+    Conjur::Authn.stub netrc: netrc, host: authn_host
+    Conjur::Config.merge 'account' => account
+  end
+end
+
+shared_context "when logged in", logged_in: true do
+  include_context "with mock authn"
+  let(:username) { 'dknuth' }
+  let(:api_key) { 'sekrit' }
+  let(:api) { Conjur::API.new_from_key(username, api_key) }
+  before do
+    api.stub credentials: {}
+    netrc[authn_host] = [username, api_key]
+    Conjur::Command.stub api: api
+  end
+end
+
+shared_context "when not logged in", logged_in: false do
+  include_context "with mock authn"
+end

data/lib/conjur/command/script.rb

@@ -29,7 +29,7 @@ class Conjur::Command::Authn < Conjur::Command
   command :execute do |c|
     acting_as_option(c)
     
-    c.desc "Load context from this config file; save it when finished"
+    c.desc "Load context from this config file, and save it when finished. The file permissions will be 0600 by default."
     c.arg_name "context"
     c.flag [:c, :context]
     
@@ -55,6 +55,7 @@ class Conjur::Command::Authn < Conjur::Command
       
       if options[:context]
         File.write(options[:context], JSON.pretty_generate(runner.context))
+        File.chmod(0600, options[:context])
       end
 
       puts JSON.pretty_generate(result)

data/lib/conjur/command/variables.rb

@@ -28,10 +28,10 @@ class Conjur::Command::Variables < Conjur::Command
   arg_name "id?"
   command :create do |c|
     c.arg_name "mime_type"
-    c.flag [:m, :"mime-type"]
+    c.flag [:m, :"mime-type"], default_value: "text/plain"
     
     c.arg_name "kind"
-    c.flag [:k, :"kind"]
+    c.flag [:k, :"kind"], default_value: "secret"
     
     acting_as_option(c)
     
@@ -44,7 +44,7 @@ class Conjur::Command::Variables < Conjur::Command
       
       options.delete(:"mime-type")
       options.delete(:"kind")
-      
+    
       var = api.create_variable(mime_type, kind, options)
       display(var, options)
     end
@@ -82,4 +82,4 @@ class Conjur::Command::Variables < Conjur::Command
       $stdout.write api.variable(id).value(options[:version])
     end
   end
-end
+end

data/lib/conjur/config.rb

@@ -18,6 +18,8 @@
 # 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 'active_support/core_ext/hash/deep_merge'
+require 'active_support/core_ext/hash/indifferent_access'
 module Conjur
   class Config
     @@attributes = {}
@@ -25,7 +27,7 @@ module Conjur
     class << self
       def load
         require 'yaml'
-        [ File.join("/etc", "conjur.conf"), ( ENV['CONJURRC'] || File.join(ENV['HOME'], ".conjurrc") ) ].each do |f|
+        [ File.join("/etc", "conjur.conf"), ( ENV['CONJURRC'] || File.join(ENV['HOME'], ".conjurrc") ), '.conjurrc' ].each do |f|
           if File.exists?(f)
             if Conjur.log
               Conjur.log << "Loading #{f}\n"
@@ -36,13 +38,15 @@ module Conjur
       end
       
       def apply
-        ENV['CONJUR_ENV'] = Config[:env] || "production"
-        ENV['CONJUR_STACK'] = Config[:stack] if Config[:stack]
-        ENV['CONJUR_STACK'] ||= 'v4' if ENV['CONJUR_ENV'] == 'production'
-        ENV['CONJUR_ACCOUNT'] = Config[:account] or raise "Missing configuration setting: account. Please set it in ~/.conjurrc"
+        keys = Config.keys.dup
+        keys.delete(:plugins)
+        keys.each do |k|
+          value = Config[k]
+          Conjur.configuration.set k, value if value
+        end
   
         if Conjur.log
-          Conjur.log << "Using host #{Conjur::Authn::API.host}\n"
+          Conjur.log << "Using authn host #{Conjur::Authn::API.host}\n"
         end
       end
       
@@ -61,7 +65,11 @@ module Conjur
       
       def merge(a)
         a = {} unless a
-        @@attributes.merge!(a)
+        @@attributes.deep_merge!(a.stringify_keys)
+      end
+      
+      def keys
+        @@attributes.keys.map(&:to_sym)
       end
       
       def [](key)

data/lib/conjur/dsl/runner.rb

@@ -25,6 +25,12 @@ module Conjur
         @objects = Array.new
       end
       
+      # Provides a hash to export various application specific
+      # asset ids (or anything else you want)
+      def assets
+        @context['assets'] ||= {}
+      end
+      
       def api
         @api ||= connect
       end
@@ -150,7 +156,7 @@ module Conjur
       
       def do_object obj, &block
         begin
-          api_keys[obj.resourceid] = obj.api_key 
+          api_keys[obj.resourceid] = obj.api_key if obj.api_key 
         rescue
         end
         

data/lib/conjur/version.rb

@@ -19,5 +19,5 @@
 # CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #
 module Conjur
-  VERSION = "4.3.0"
+  VERSION = "4.4.0"
 end

data/spec/command/variables_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 describe Conjur::Command::Variables, logged_in: true do
   let(:collection_url) { "https://core.example.com/variables" }
 
-  let(:base_payload) { { mime_type: 'text/plain', kind: 'password' } }
+  let(:base_payload) { { mime_type: 'text/json', kind: 'password' } }
 
-  describe_command "variable:create -m text/plain -k password" do
+  describe_command "variable:create -m text/json -k password" do
     it "lets the server assign the id" do
      RestClient::Request.should_receive(:execute).with(
         method: :post,
@@ -17,7 +17,7 @@ describe Conjur::Command::Variables, logged_in: true do
       expect { invoke }.to write({ id: 'assigned-id' }).to(:stdout)
     end
   end
-  describe_command "variable:create -m text/plain -k password the-id" do
+  describe_command "variable:create -m text/json -k password the-id" do
     it "propagates the user-assigned id" do
      RestClient::Request.should_receive(:execute).with(
         method: :post,
@@ -29,4 +29,20 @@ describe Conjur::Command::Variables, logged_in: true do
       expect { invoke }.to write({ id: 'the-id' }).to(:stdout)
     end
   end
-end
+
+
+  describe_command "variable:create" do
+    it "provides default values for optional parameters mime_type and kind" do
+      RestClient::Request.should_receive(:execute).with(
+        method: :post,
+        url: collection_url,
+        headers: {},
+        payload: { mime_type: 'text/plain', kind: 'secret'}
+        ).and_return(post_response('the-id'))
+      expect { invoke }.to write # invoke_silently
+    end
+  end
+
+
+
+end

data/spec/spec_helper.rb

@@ -5,61 +5,6 @@ require 'ostruct'
 
 require "simplecov"
 SimpleCov.start
-
-module RSpec::Core::DSL
-  def describe_command *argv, &block
-    describe *argv do
-      let(:invoke) do
-        Conjur::CLI.error_device = $stderr
-        Conjur::CLI.run argv.first.split(' ')
-      end
-      instance_eval &block
-    end
-  end
-end
-
-shared_context "with fake endpoints and test config" do
-  let(:authn_host) { 'https://authn.example.com' }
-  let(:authz_host) { 'https://authz.example.com' }
-  let(:core_host) { 'https://core.example.com' }
-  before do
-    Conjur::Authn::API.stub host: authn_host
-    Conjur::Authz::API.stub host: authz_host
-    Conjur::Core::API.stub host: core_host
-
-    ENV['GLI_DEBUG'] = 'true'
-  end
-end
-
-shared_context "with mock authn" do
-  include_context "with fake endpoints and test config"
-  let(:netrcfile) { Tempfile.new 'authtest' }
-  let(:netrc) { Netrc.read(netrcfile.path) }
-  let(:account) { 'the-account' }
-  before do
-    Conjur::Core::API.stub conjur_account: account
-    Conjur::Authn.stub netrc: netrc, host: authn_host
-    Conjur::Config.merge 'account' => account
-  end
-
-end
-
-shared_context "when logged in", logged_in: true do
-  include_context "with mock authn"
-  let(:username) { 'dknuth' }
-  let(:api_key) { 'sekrit' }
-  let(:api) { Conjur::API.new_from_key(username, api_key) }
-  before do
-    api.stub credentials: {}
-    netrc[authn_host] = [username, api_key]
-    Conjur::Command.stub api: api
-  end
-end
-
-shared_context "when not logged in", logged_in: false do
-  include_context "with mock authn"
-end
-
   
 def post_response(id, attributes = {})
   attributes[:id] = id
@@ -79,7 +24,7 @@ PRIVILEGE='<privilege>'
 OWNER='<owner/userid>'
 ACCOUNT='<core_account>'
 
-require 'write_expectation'
+require 'conjur/command/rspec/helpers'
 
 ENV['CONJURRC'] = '/dev/null'
 

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 4.3.0
-  prerelease: 
+  version: 4.4.0
 platform: ruby
 authors:
 - Rafał Rzepecki
@@ -10,172 +9,151 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-19 00:00:00.000000000 Z
+date: 2013-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: conjur-api
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '4.0'
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: netrc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: methadone
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: deep_merge
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cas_rest_client
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ci_reporter
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -183,7 +161,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -191,7 +168,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -199,7 +175,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -249,6 +224,10 @@ files:
 - lib/conjur/command/ids.rb
 - lib/conjur/command/resources.rb
 - lib/conjur/command/roles.rb
+- lib/conjur/command/rspec/describe_command.rb
+- lib/conjur/command/rspec/helpers.rb
+- lib/conjur/command/rspec/mock_services.rb
+- lib/conjur/command/rspec/output_matchers.rb
 - lib/conjur/command/script.rb
 - lib/conjur/command/secrets.rb
 - lib/conjur/command/users.rb
@@ -268,38 +247,30 @@ files:
 - spec/command/variables_spec.rb
 - spec/command_spec.rb
 - spec/spec_helper.rb
-- spec/write_expectation.rb
 - update_ci.sh
 homepage: https://github.com/inscitiv/cli-ruby
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1644875280166095669
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -1644875280166095669
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Conjur command line interface
 test_files:
 - features/dsl_context.feature
@@ -324,4 +295,3 @@ test_files:
 - spec/command/variables_spec.rb
 - spec/command_spec.rb
 - spec/spec_helper.rb
-- spec/write_expectation.rb