conjur-cli 5.2.0 → 5.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4737c65684b90ddd2b62d5fb186573b7099e496b
-  data.tar.gz: c6ff97b50c512c96568e0361991af49309b868ac
+  metadata.gz: 0b1e4204f00a0e45272ef0ea6a2e051e2e718d94
+  data.tar.gz: 980a03e7ad8b258e747c32a3f7eb058f0cff72fc
 SHA512:
-  metadata.gz: 6bcb80c73f81df2f96f1d18780c2d94f69c1fe3d8ec9153e6276b529ecd21429836a8ec08a058c2975471d751e9f6cc5bf3332a1f0e9640fbc67ca48ac1a3ca1
-  data.tar.gz: 3a355ec8286f3b4d198777b5f34666c4cfaf6dbf9db3a9f558c47ee54166439e259a3aabd3a5ae3bcc12086137a434bba2d415ac8c2c4e47c27bd279ff1392a7
+  metadata.gz: 3d52c210b51e14b7a56a369c468195c2f2afcf75643be234cae9f0a6cc5f01b5297cfe16629c965ebd657532eb78fc13558682c0abde087c60f04a507d1b66d8
+  data.tar.gz: ada494c4e8d7b1f39130d753fd8941cbf02e63e2254616a5c61f54d4579b991a18257de9156043bbb474155b367cdc07d90ce9996dba5c7954844b212478563c

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 5.2.1
+
+* Fix handling of `ldap-sync` dry-run argument.
+
 # 5.2.0
 
 * Add `ldap-sync` management commands (requires Conjur 4.7 or later).

data/Dockerfile

@@ -7,4 +7,9 @@ COPY Gemfile Gemfile
 COPY conjur.gemspec conjur.gemspec
 COPY lib/conjur/version.rb lib/conjur/version.rb
 
-RUN gem install bundler -v 1.11.2 && bundle install
+# Make sure only one version of bundler is available
+RUN gem uninstall bundler -i /usr/local/lib/ruby/gems/2.1.0 bundler || true && \
+  gem uninstall bundler -i /usr/local/lib/ruby/gems/2.2.0 bundler || true && \
+  gem uninstall bundler -aIx && \
+  gem install bundler -v 1.11.2 && \
+  bundle install

data/conjur.gemspec

@@ -16,6 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Conjur::VERSION
 
   gem.add_dependency 'activesupport', '~> 4.2'
+  gem.add_dependency 'bundler', '< 1.12.0'
   gem.add_dependency 'conjur-api', '~> 4.21'
   gem.add_dependency 'gli', '>=2.8.0'
   gem.add_dependency 'highline', '~> 1.7'

data/lib/conjur/command/ldapsync.rb

@@ -24,8 +24,12 @@ class Conjur::Command::LDAPSync < Conjur::Command
         assert_empty args
         
         format = options[:format] == 'text' ? 'application/json' : 'text/yaml'
+
+        # options[:'dry-run'] is nil when dry_run should be disabled (either --no-dry-run
+        # or no option given at all). It is true when --dry-run is given.
         dry_run = options[:'dry-run']
-          
+        dry_run = false if dry_run.nil?
+
         $stderr.puts "Performing #{dry_run ? 'dry run ' : ''}LDAP sync"
   
         response = api.ldap_sync_now(options[:profile], format, dry_run)

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 = '5.2.0'
+  VERSION = '5.2.1'
   ::Version=VERSION
 end

data/spec/command/ldapsync_spec.rb

@@ -40,4 +40,33 @@ describe Conjur::Command::LDAPSync, logged_in: true do
       expect { invoke }.to write(yaml_response)
     end
   end
+
+  context 'when testing dry-run' do
+    before do
+      expect_any_instance_of(Conjur::API).to receive(:ldap_sync_now)
+                                              .with('default', 'application/json', dry_run)
+                                              .and_return json_response
+    end
+
+    describe_command 'ldap-sync now' do
+      let(:dry_run) { false }
+      it 'passes falsey dry-run value' do
+        invoke
+      end
+    end
+
+    describe_command 'ldap-sync now --no-dry-run' do
+      let(:dry_run) { false }
+      it 'passes falsey dry-run value' do
+        invoke
+      end
+    end
+
+    describe_command 'ldap-sync now --dry-run' do
+      let(:dry_run) { true }
+      it 'passes truthy dry-run value' do
+        invoke
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: conjur-cli
 version: !ruby/object:Gem::Version
-  version: 5.2.0
+  version: 5.2.1
 platform: ruby
 authors:
 - Rafal Rzepecki
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-24 00:00:00.000000000 Z
+date: 2016-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -25,6 +25,20 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '4.2'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.12.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: 1.12.0
 - !ruby/object:Gem::Dependency
   name: conjur-api
   requirement: !ruby/object:Gem::Requirement