Merge pull request #183 from rtyler/issues/135-unzip-not-available

Rely on the `jar` command instead of `unzip` to unpack the cli.jar

.travis.yml

@@ -1,14 +1,15 @@
 language: ruby
-bundler_args: --without development
+before_install: gem install bundler -v '~> 1.6.0' --no-ri --no-rdoc
+bundler_args: "--without development plugins"
 script: "bundle exec rake spec SPEC_OPTS='--format documentation'"
 rvm:
   - 1.8.7
   - 1.9.3
   - 2.0.0
   - 2.1.0
 script:
-  - "rake lint"
-  - "rake spec SPEC_OPTS='--format documentation'"
+  - "bundle exec rake lint"
+  - "bundle exec rake spec SPEC_OPTS='--format documentation'"
 env:
   - PUPPET_VERSION="~> 2.7.0"
   - PUPPET_VERSION="~> 3.1.0"

Gemfile

@@ -2,6 +2,7 @@ source 'https://rubygems.org'
 
 gem 'rake', '>= 10.1.1'
 gem 'rspec', '~> 2.99.0'
+gem 'rspec-its'
 gem 'puppet-lint', '>= 0.3.2'
 gem 'rspec-puppet', '>= 1.0.1'
 gem 'puppetlabs_spec_helper', :github => 'jenkins-infra/puppetlabs_spec_helper'
@@ -18,7 +19,7 @@ group :development do
 
   gem 'serverspec'
   gem 'vagrant', :github => 'mitchellh/vagrant',
-                 :ref => 'v1.5.3',
+                 :ref => 'v1.6.5',
                  :platform => :mri
 end
 

manifests/cli.pp

@@ -19,7 +19,7 @@
     }
   }
 
-  $extract_jar = "unzip ${war} WEB-INF/jenkins-cli.jar"
+  $extract_jar = "jar -xf ${war} WEB-INF/jenkins-cli.jar"
   $move_jar = "mv WEB-INF/jenkins-cli.jar ${jar}"
   $remove_dir = 'rm -rf WEB-INF'
 

spec/serverspec/ubuntu-precise/manifests/default.pp

@@ -1,6 +1,9 @@
 
 node default {
-  include jenkins
+  class {
+    'jenkins':
+      cli => true,
+  }
 
   notice("Hello world from ${::hostname}}")
 }

spec/serverspec/ubuntu-precise/precise_spec.rb

@@ -17,6 +17,10 @@
           should be_listening }
     end
 
+    describe file('/usr/share/jenkins/jenkins-cli.jar') do
+      it { should be_file }
+    end
+
     describe service('jenkins') do
       it { should be_running }
       it { should be_enabled }