maestro-plugin-rake-tasks 1.0.8 → 1.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 23f7567d2fdf5068054fdb21d50ba58955108c27
-  data.tar.gz: 7224f6c1c19eaa11c4ffc196f52072ca607b8478
+  metadata.gz: c0af21277c071e1a8a262b1872ba817a9252a27d
+  data.tar.gz: a09c3a12397fb0a5604f20af8d40aa4d341ea93b
 SHA512:
-  metadata.gz: cc0490dff1b12e892e4e9ce9d1be16452900b3571c0a1b9121f80f9d79783ca7566eae46c5bab4a7f5bfe7f7efe649a9314a519cb4b8dc0ccf48b0b074064231
-  data.tar.gz: 019feb0e9f5c3405bf7da4762f945500b967f5212a6af0ff39279fe13418f0104155b205f5690733105d60d31274f6d1507f3a157bedf11645f1b884ad3a465a
+  metadata.gz: e6e9933bd901323e6618fffa51813f841870db2c1d087d2a9153684493e1397fa748cafc078aa127fc9d51485210326ce254711fd58434bf888dc30c0e171863
+  data.tar.gz: 8d8eb2a4979ce98a3b49253cc9d871250e904aca0c4d2f5b7501c9933083069bc94825caafa9b3e0cb9eb91a498850c1d150b343fbf868c4f05660407ffbde4b

data/Rakefile

@@ -1,12 +1,12 @@
 require "bundler/gem_tasks"
 require 'rspec/core/rake_task'
+require 'cucumber/rake/task'
 require 'rake/clean'
 
 CLEAN.include('pkg', 'manifest.json', '*.zip')
 CLOBBER.include('.bundle', '.config', 'coverage', 'InstalledFiles', 'spec/reports', 'rdoc', 'test', 'tmp')
 
-task :default => [:clean, :spec, :build]
+task :default => [:clean, :spec, :cucumber, :build]
 
 RSpec::Core::RakeTask.new
-
-
+Cucumber::Rake::Task.new

data/features/package.feature

@@ -0,0 +1,74 @@
+Feature: package
+  Rake package task should create a zip file
+
+  Scenario: Packaging a plugin
+    Given a file named "Rakefile" with:
+    """
+    require 'maestro/plugin/rake_tasks'
+    Maestro::Plugin::RakeTasks::PackageTask.new
+    """
+    And a file named "pom.xml" with:
+    """
+    <?xml version="1.0"?>
+    <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+      <modelVersion>4.0.0</modelVersion>
+      <groupId>com.maestrodev.maestro.plugins</groupId>
+      <artifactId>maestro-jenkins-plugin</artifactId>
+      <version>2.3-SNAPSHOT</version>
+    </project>
+    """
+    And a file named "manifest.template.json" with:
+    """
+    {
+      "tasks": [
+        {
+          "name": "jenkins plugin",
+          "description": "Run A Set Of Work Steps In Jenkins",
+          "license": "Apache 2.0",
+          "author": "Kelly Plummer",
+          "version": "updated at build time",
+          "class": "MaestroDev::Plugin::JenkinsWorker",
+          "type": "ruby",
+          "dependencies": [],
+          "task": {
+            "command": "/jenkinsplugin/build",
+            "inputs": {},
+            "outputs": {},
+            "icon": "jenkins.png",
+            "tool_name": "Build"
+          }
+        },
+        {
+          "name": "jenkins sync",
+          "description": "Get the data from the latest build for a particular job",
+          "license": "Apache 2.0",
+          "author": "Etienne Pelletier",
+          "version": "updated at build time",
+          "class": "MaestroDev::Plugin::JenkinsWorker",
+          "type": "ruby",
+          "dependencies": [],
+          "task": {
+            "command": "/jenkinsplugin/get_build_data",
+            "inputs": {},
+            "outputs": {},
+            "icon": "jenkins.png",
+            "tool_name": "Build"
+          }
+        }
+      ]
+    }
+    """
+    And an empty file named "src/test.rb"
+    And an empty file named "vendor/cache/andand-1.3.3.gem"
+    And an empty file named "README.md"
+    And an empty file named "LICENSE"
+    When I run `rake package`
+    Then the exit status should be 0
+    And a file named "maestro-jenkins-plugin-2.3-SNAPSHOT.zip" should exist
+    And I run `unzip -t maestro-jenkins-plugin-2.3-SNAPSHOT.zip`
+    Then the zip file "maestro-jenkins-plugin-2.3-SNAPSHOT.zip" should contain the following files:
+        | manifest.json |
+        | LICENSE |
+        | README.md |
+        | src/test.rb |
+        | vendor/cache/andand-1.3.3.gem |

data/features/support/env.rb

@@ -0,0 +1,15 @@
+require 'aruba/cucumber'
+require 'zip'
+
+Before do
+  @aruba_timeout_seconds = 20
+end
+
+Then /^the zip file "([^"]*)" should contain the following files:$/ do |zipFile, files|
+  entries = []
+  prep_for_fs_check do
+    Zip::File.foreach(zipFile) { |zipEntry| entries << zipEntry.to_s }
+  end
+  expected_entries = files.raw.select{|file_row| file_row[0]}.flatten
+  entries.to_set.should eq(expected_entries.to_set)
+end

data/lib/maestro/plugin/rake_tasks/package_task.rb

@@ -1,7 +1,7 @@
 require 'maestro/plugin/rake_tasks/version'
 require 'rake'
 require 'rake/tasklib'
-require 'zippy'
+require 'zip'
 require 'git'
 require 'nokogiri'
 require 'json'
@@ -141,30 +141,25 @@ module Maestro
         end
 
         def create_zip_file(zip_file)
-          Zippy.create zip_file do |z|
+          Zip::File.open(zip_file, Zip::File::CREATE) do |z|
             @directories.each { |dir| add_dir z, dir }
             @files.each { |file| add_file z, file }
           end
         end
 
         # add a file to the zip file
-        def add_file( zippyfile, f )
+        def add_file( zipfile, f )
           if File.exists?(f)
             puts "Writing #{f} at #{@dest_dir}" if verbose
-            zippyfile["#{@dest_dir}/#{f}"] = File.open(f)
+            zipfile.add(f, "#{@dest_dir}/#{f}")
           else
             puts "Ignoring missing file #{f} at #{@dest_dir}"
           end
         end
 
         # add a directory to the zip file
-        def add_dir( zippyfile, d )
-          glob = "#{d}/**/*"
-          FileList.new( glob ).each { |f|
-            if (File.file?(f))
-              add_file zippyfile, f
-            end
-          }
+        def add_dir( zipfile, d )
+          FileList.new("#{d}/**/*").each { |f| add_file(zipfile, f) if File.file?(f) }
         end
 
       end

data/lib/maestro/plugin/rake_tasks/version.rb

@@ -1,7 +1,7 @@
 module Maestro
   module Plugin
     module RakeTasks
-        VERSION = '1.0.8'
+        VERSION = '1.0.9'
     end
   end
 end

data/maestro-plugin-rake-tasks.gemspec

@@ -21,10 +21,11 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'rake', '>=0.9.2'
   spec.add_dependency 'nokogiri'
   spec.add_dependency 'git'
-  spec.add_dependency 'zippy'
-  spec.add_dependency 'rubyzip', '<1.0.0' # for zippy
+  spec.add_dependency 'rubyzip', '>=1.0.0'
   spec.add_dependency 'json', '>= 1.4.6'
 
   spec.add_development_dependency 'rspec', '>= 2.13.0'
+  spec.add_development_dependency 'cucumber'
+  spec.add_development_dependency 'aruba'
   spec.add_development_dependency 'jruby-openssl' if RUBY_PLATFORM == 'java'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maestro-plugin-rake-tasks
 version: !ruby/object:Gem::Version
-  version: 1.0.8
+  version: 1.0.9
 platform: ruby
 authors:
 - Etienne Pelletier
@@ -53,59 +53,73 @@ dependencies:
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: zippy
+  name: rubyzip
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.0.0
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rubyzip
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.6
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - <
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.4.6
   prerelease: false
   type: :runtime
 - !ruby/object:Gem::Dependency
-  name: json
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 2.13.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 1.4.6
+        version: 2.13.0
   prerelease: false
-  type: :runtime
+  type: :development
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: cucumber
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 2.13.0
+        version: '0'
+  prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: aruba
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   prerelease: false
   type: :development
 - !ruby/object:Gem::Dependency
@@ -130,11 +144,12 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
-- .ruby-version
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- features/package.feature
+- features/support/env.rb
 - lib/maestro/plugin/rake_tasks.rb
 - lib/maestro/plugin/rake_tasks/bundle_task.rb
 - lib/maestro/plugin/rake_tasks/package_task.rb
@@ -171,6 +186,8 @@ signing_key:
 specification_version: 4
 summary: A collection of Rake tasks used to package Maetro Ruby plugins
 test_files:
+- features/package.feature
+- features/support/env.rb
 - spec/maestro/plugin/rake_tasks/package_task_spec.rb
 - spec/manifest-multi-task.template.json
 - spec/manifest-single-task.template.json

data/.ruby-version

@@ -1 +0,0 @@
-jruby-1.7.4