jenkins-plugin 0.1.11 → 0.1.12

data/features/create-new-plugin.feature

@@ -5,86 +5,14 @@ Creating a new Ruby plugin for Jenkins needs to be as simple as running a single
 that will generate a project skeleton. This skeleton will come complete with git repository and all
 the goodies that you need to do your plugin develompent.
 
-Background: Creating a brand new Jenkins Ruby Plugin
-  Given I've run "jenkins-plugin create newplugin"
-
 Scenario: The directory skeleton is generated
-  Then I should see this structure
-  """
-  [-] newplugin
-   | [+] .git
-   | .gitignore
-   | Gemfile
-   | Rakefile
-   | [-] lib
-   | [-] newplugin
-   |  |  | version.rb
-   |  | newplugin.rb
-   | [-] spec
-   |  | spec_helper.rb
-   | [-] plugin
-   |  | [+] models
-   |  | [+] views
-  """
-
-Scenario: The .gitignore contents
-  When I open ".gitignore"
-  Then I should see
-  """
-.bundle
-.rvmrc
-.rspec
-  """
-
-Scenario: The Gemfile contents
-  When I open "Gemfile"
-  Then I should see
-  """
-source :rubygems
-
-gem "jenkins-war"
-gem "jenkins-plugins"
-  """
-
-Scenario: The Rakefile contents
-  When I open "Rakefile"
-  Then I should see
-  """
-require 'jenkins/rake'
-Jenkins::Rake.install_tasks
-  """
-
-Scenario: The plugin module contents
-  When I open "lib/newplugin.rb"
-  Then I should see
-  """
-module Newplugin
-
-  def self.start
-    #do any startup when this plugin initializes
-  end
-
-  def self.stop
-    #perform any necessary cleanup when this plugin is shut down.
-  end
-end
-  """
-
-Scenario: The version file is generated
-  When I open "lib/newplugin/version.rb"
-  Then I should see
-  """
-
-module Newplugin
-  VERSION = 0.0.1
-end
-  """
-
-Scenario: The spec_helper is created
-  When I open "spec/spec_helper.rb"
-  Then I should see
-  """
-  $:.unshift(Pathname(__FILE__).dirname.join('../lib'))
-  require 'newplugin'
-  """
-
+  When I run "jpi new newplugin"
+  # Then I should see this structure
+  # """
+  # [-] newplugin
+  #  | [+] .git
+  #  | .gitignore
+  #  | Gemfile
+  #  | Rakefile
+  #  | newplugin.pluginspec
+  # """

data/features/support/create_new_plugin_steps.rb

@@ -0,0 +1,7 @@
+When /^I run "([^"]*)"$/ do |cmd|
+  run cmd
+end
+
+Then /^I should see this structure$/ do |structure|
+  fail "no match" unless DirectoryStructure.new(structure).matches? work_dir
+end

data/features/support/directory_structure.rb

@@ -0,0 +1,49 @@
+
+class DirectoryStructure
+  def initialize(structure)
+
+    @root = context = DirChild.new('.')
+
+    structure.each_line do |line|
+      if line =~ /(\[[-+]\]|\|)?\s+(\.?\w+)$/
+        op, name = $1, $2
+        case op
+        when "[+]"
+          context.add(DirChild.new name)
+        when "[-]"
+          new_context = DirChild.new name
+          context.add(new_context)
+          context = new_context
+        when "|"
+          context.add(FileChild.new name)
+        end
+      end
+    end
+  end
+
+  def matches?(dir)
+    @root.matches?(dir)
+  end
+
+  Entry = Struct.new(:name)
+
+  class DirChild < Entry
+    def initialize(name)
+      super(name)
+      @entries = []
+    end
+
+    def add(entry)
+      @entries << entries
+    end
+
+    def matches?(realdir)
+      entries = Dir.new(realdir).entries
+      !@entries.detect {|e| !entries.map{|e| File.basename(e)}.member?(e)}
+    end
+  end
+
+  class FileChild < Entry
+
+  end
+end

data/features/support/work.rb

@@ -0,0 +1,20 @@
+module Work
+  def run cmd
+    Dir.chdir(work_dir) do
+      root = Pathname(__FILE__).join('..', '..', '..')
+      full_cmd = "ruby -rubygems -I #{root.join('lib')} -S #{root.join('bin',cmd)}"
+      system(full_cmd) or fail "failed to run command #{cmd}"
+    end
+  end
+
+  def work_dir
+    @work_dir ||= File.expand_path("tmp/work")
+  end
+end
+
+Before do
+  FileUtils.rm_rf work_dir
+  FileUtils.mkdir_p work_dir
+end
+
+World(Work)

data/lib/jenkins/plugin/cli/generate.rb

@@ -9,13 +9,13 @@ module Jenkins
 
         argument :name
 
-        desc "publisher", "publisher NAME", "generate a publish step definition"
+        desc "publisher", "publisher NAME", :desc => "generate a publish step definition"
         def publisher
           @step_class = "Publisher"
           template('templates/build_step.tt', "models/#{name.downcase}_publisher.rb")
         end
 
-        desc "builder", "builder NAME", "generate a build step definition"
+        desc "builder", "builder NAME", :desc => "generate a build step definition"
         def builder
           @step_class = "Builder"
           template('templates/build_step.tt', "models/#{name.downcase}_builder.rb")

data/lib/jenkins/plugin/tools/manifest.rb

@@ -1,4 +1,6 @@
 
+#require 'jenkins/plugin/version'
+
 require 'jenkins/plugin/version'
 
 module Jenkins
@@ -11,37 +13,66 @@ module Jenkins
         end
 
         def write_hpi(io)
-          io.puts "Manifest-Version: 1.0"
-          io.puts "Created-By: #{Jenkins::Plugin::VERSION}"
-          io.puts "Build-Ruby-Platform: #{RUBY_PLATFORM}"
-          io.puts "Build-Ruby-Version: #{RUBY_VERSION}"
+          w = Writer.new(io)
+          w.put "Manifest-Version", "1.0"
+          w.put "Created-By", Jenkins::Plugin::VERSION
+          w.put "Build-Ruby-Platform", RUBY_PLATFORM
+          w.put "Build-Ruby-Version", RUBY_VERSION
 
-          io.puts "Group-Id: org.jenkins-ci.plugins"
-          io.puts "Short-Name: #{@spec.name}"
-          io.puts "Long-Name: #{@spec.name}" # TODO: better name
-          io.puts "Url: http://jenkins-ci.org/" # TODO: better value
+          w.put "Group-Id", "org.jenkins-ci.plugins"
+          w.put "Short-Name", @spec.name
+          w.put "Long-Name", @spec.name # TODO: better name
+          w.put "Url", "http://jenkins-ci.org/" # TODO: better value
 
-          io.puts "Plugin-Class: ruby.RubyPlugin"
-          io.puts "Plugin-Version: #{@spec.version}"
-          io.puts "Jenkins-Version: 1.426"
+          w.put "Plugin-Class", "ruby.RubyPlugin"
+          w.put "Plugin-Version", @spec.version
+          w.put "Jenkins-Version", "1.426"
 
-          io.puts "Plugin-Dependencies: " + @spec.dependencies.map{|k,v| "#{k}:#{v}"}.join(",")
+          w.put "Plugin-Dependencies", @spec.dependencies.map{|k,v| "#{k}:#{v}"}.join(",")
         end
 
         def write_hpl(io, loadpath)
           write_hpi(io)
 
-          io.puts "Load-Path: #{loadpath.to_a.join(':')}"
-          io.puts "Lib-Path: #{Dir.pwd}/lib/"
-          io.puts "Models-Path: #{Dir.pwd}/models"
+          w = Writer.new(io)
+          w.put "Load-Path", loadpath.to_a.join(':')
+          w.put "Lib-Path", "#{Dir.pwd}/lib/"
+          w.put "Models-Path", "#{Dir.pwd}/models"
           # Stapler expects view erb/haml scripts to be in the JVM ClassPath
-          io.puts "Class-Path: #{Dir.pwd}/views" if File.exists?("#{Dir.pwd}/views")
+          w.put "Class-Path", "#{Dir.pwd}/views" if File.exists?("#{Dir.pwd}/views")
           # Directory for static images, javascript, css, etc. of this plugin.
           # The static resources are mapped under #CONTEXTPATH/plugin/SHORTNAME/
-          io.puts "Resource-Path: #{Dir.pwd}/static"
+          w.put "Resource-Path", "#{Dir.pwd}/static"
+        end
+
+        class Writer
+
+          MAX_LENGTH = 72.to_i
+
+          def initialize(io)
+            @io = io
+          end
+
+          def put(key, value)
+            @io.puts "#{key}: #{manifest_truncate(value)}"
+          end
+
+          def manifest_truncate(message)
+            if message.length < MAX_LENGTH
+              return message
+            end
+
+            line = message[0 ... MAX_LENGTH] + "\n"
+            offset = MAX_LENGTH
 
+            while offset < message.length
+              line += " #{message[offset ... (offset + MAX_LENGTH - 1)]}\n"
+              offset += (MAX_LENGTH - 1)
+            end
+            return line
+          end
         end
       end
     end
   end
-end
+end

data/lib/jenkins/plugin/version.rb

@@ -1,5 +1,5 @@
 module Jenkins
   class Plugin
-    VERSION = "0.1.11"
+    VERSION = "0.1.12"
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jenkins-plugin
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 3
   prerelease: 
   segments: 
   - 0
   - 1
-  - 11
-  version: 0.1.11
+  - 12
+  version: 0.1.12
 platform: ruby
 authors: 
 - Charles Lowell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-01 00:00:00 -05:00
+date: 2011-10-05 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -137,6 +137,9 @@ files:
 - Rakefile
 - bin/jpi
 - features/create-new-plugin.feature
+- features/support/create_new_plugin_steps.rb
+- features/support/directory_structure.rb
+- features/support/work.rb
 - jenkins-plugin.gemspec
 - lib/jenkins/plugin/cli.rb
 - lib/jenkins/plugin/cli/formatting.rb
@@ -188,3 +191,6 @@ specification_version: 3
 summary: Tools for creating and building Jenkins Ruby plugins
 test_files: 
 - features/create-new-plugin.feature
+- features/support/create_new_plugin_steps.rb
+- features/support/directory_structure.rb
+- features/support/work.rb