jpi 0.3.4 → 0.3.5

data/jpi.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Charles Lowell", "Jørgen P. Tjernø", "Kohsuke Kawaguchi"]
   s.email       = ["cowboyd@thefrontside.net"]
-  s.homepage    = "https://github.com/jenkinsci/jpi.rb"
+  s.homepage    = "https://github.com/jenkinsci/jenkins.rb/tree/master/ruby-tools/jpi"
   s.summary     = %q{Tools for creating and building Jenkins Ruby plugins}
   s.description = %q{Allows you to generate a new Ruby plugin project, build it, test it in Jenkins and release it to the Jenkins Update Center.}
 
@@ -21,7 +21,7 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
   s.add_dependency "jenkins-war", ">= 1.427"
   s.add_dependency "bundler", "~> 1.1.0"
-  s.add_dependency "jenkins-plugin-runtime", "~> 0.2.0"
+  s.add_dependency "jenkins-plugin-runtime", "~> #{Jenkins::Plugin::RUNTIME_VERSION_DEPENDENCY}"
 
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "cucumber", "~> 1.0"

data/lib/jenkins/plugin/cli.rb

@@ -5,6 +5,18 @@ require 'jenkins/plugin/cli/formatting'
 require 'jenkins/plugin/cli/new'
 require 'jenkins/plugin/cli/generate'
 
+# Until a new version (>= 0.14.6 & 0.15.0rc2) is released, this backports a fix
+# for JRuby argument handling:
+# https://github.com/wycats/thor/commit/33490a59ed297eb798381f1c86cbaa3608413eaf
+class Thor
+  class Task
+    def sans_backtrace(backtrace, caller) #:nodoc:
+      saned  = backtrace.reject { |frame| frame =~ FILE_REGEXP || (frame =~ /\.java:/ && RUBY_PLATFORM =~ /java/) }
+      saned -= caller
+    end
+  end
+end
+
 
 module Jenkins
   class Plugin
@@ -63,4 +75,4 @@ module Jenkins
 
     end
   end
-end
+end

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

@@ -1,5 +1,5 @@
-
 require 'thor/group'
+require 'jenkins/plugin/version'
 
 module Jenkins
   class Plugin
@@ -11,8 +11,16 @@ module Jenkins
 
         argument :name
 
+        def name
+          @name.gsub(/\s+/, '-').sub(/[_-]plugin$/, '')
+        end
+
+        def repository_name
+          name + '-plugin'
+        end
+
         def create_gemfile
-          template('templates/Gemfile.tt', "#{name}/Gemfile")
+          template('templates/Gemfile.tt', "#{repository_name}/Gemfile")
         end
 
         def create_pluginspec
@@ -25,12 +33,15 @@ module Jenkins
           git_name = 'TODO: Put your realname here' if git_name.empty?
           git_email = 'email@example.com' if git_email.empty?
 
+          display_name_components = repository_name.split(/[-_]/).collect { |w| w.capitalize }
+
           opts = {
             :developer_id => developer_id.empty? ? 'TODO: Put your jenkins-ci.org username here.' : developer_id,
-            :developer_name => "#{git_name} <#{git_email}>"
+            :developer_name => "#{git_name} <#{git_email}>",
+            :display_name => display_name_components.join(' ')
           }
 
-          template('templates/pluginspec.tt', "#{name}/#{name}.pluginspec", opts)
+          template('templates/pluginspec.tt', "#{repository_name}/#{name}.pluginspec", opts)
         end
 
       end

data/lib/jenkins/plugin/cli/templates/Gemfile.tt

@@ -1,4 +1,3 @@
-
 source :rubygems
 
-gem "jenkins-plugin-runtime", "~> 0.1.26"
+gem "jenkins-plugin-runtime", "~> <%= Jenkins::Plugin::RUNTIME_VERSION_DEPENDENCY %>"

data/lib/jenkins/plugin/cli/templates/pluginspec.tt

@@ -1,28 +1,27 @@
-
 Jenkins::Plugin::Specification.new do |plugin|
   plugin.name = <%= name.inspect %>
-  plugin.display_name = <%= (name.capitalize + " Plugin").inspect %>
+  plugin.display_name = <%= config[:display_name].inspect %>
   plugin.version = '0.0.1'
-  plugin.description = 'enter description here'
+  plugin.description = 'TODO: enter description here'
 
   # You should create a wiki-page for your plugin when you publish it, see
   # https://wiki.jenkins-ci.org/display/JENKINS/Hosting+Plugins#HostingPlugins-AddingaWikipage
   # This line makes sure it's listed in your POM.
-  plugin.url = 'https://wiki.jenkins-ci.org/display/JENKINS/My+Plugin'
+  plugin.url = 'https://wiki.jenkins-ci.org/display/JENKINS/<%= config[:display_name].gsub(' ', '+') %>'
 
   # The first argument is your user name for jenkins-ci.org.
   plugin.developed_by <%= config[:developer_id].inspect %>, <%= config[:developer_name].inspect %>
 
   # This specifies where your code is hosted.
   # Alternatives include:
-  #  :github => 'myuser/my-plugin' (without myuser it defaults to jenkinsci)
-  #  :git => 'git://repo.or.cz/my-plugin.git'
-  #  :svn => 'https://svn.jenkins-ci.org/trunk/hudson/plugins/my-plugin'
-  plugin.uses_repository :github => 'my-plugin'
+  #  :github => 'myuser/<%= repository_name %>' (without myuser it defaults to jenkinsci)
+  #  :git => 'git://repo.or.cz/<%= repository_name %>.git'
+  #  :svn => 'https://svn.jenkins-ci.org/trunk/hudson/plugins/<%= repository_name %>'
+  plugin.uses_repository :github => <%= repository_name.inspect %>
 
   # This is a required dependency for every ruby plugin.
-  plugin.depends_on 'ruby-runtime', '0.4'
+  plugin.depends_on 'ruby-runtime', '0.10'
 
   # This is a sample dependency for a Jenkins plugin, 'git'.
-  plugin.depends_on 'git', '1.1.11'
+  #plugin.depends_on 'git', '1.1.11'
 end

data/lib/jenkins/plugin/version.rb

@@ -1,5 +1,6 @@
 module Jenkins
   class Plugin
-    VERSION = "0.3.4"
+    VERSION = "0.3.5"
+    RUNTIME_VERSION_DEPENDENCY = "0.2.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jpi
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,11 +11,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-30 00:00:00.000000000 Z
+date: 2012-04-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2161069120 !ruby/object:Gem::Requirement
+  requirement: &2153612260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -23,10 +23,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161069120
+  version_requirements: *2153612260
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2161067140 !ruby/object:Gem::Requirement
+  requirement: &2153611560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -34,10 +34,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161067140
+  version_requirements: *2153611560
 - !ruby/object:Gem::Dependency
   name: jenkins-war
-  requirement: &2161066140 !ruby/object:Gem::Requirement
+  requirement: &2153610700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -45,10 +45,10 @@ dependencies:
         version: '1.427'
   type: :runtime
   prerelease: false
-  version_requirements: *2161066140
+  version_requirements: *2153610700
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2161064160 !ruby/object:Gem::Requirement
+  requirement: &2153596280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -56,10 +56,10 @@ dependencies:
         version: 1.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161064160
+  version_requirements: *2153596280
 - !ruby/object:Gem::Dependency
   name: jenkins-plugin-runtime
-  requirement: &2161062540 !ruby/object:Gem::Requirement
+  requirement: &2153594900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -67,10 +67,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *2161062540
+  version_requirements: *2153594900
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161061100 !ruby/object:Gem::Requirement
+  requirement: &2153593960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -78,10 +78,10 @@ dependencies:
         version: '2.0'
   type: :development
   prerelease: false
-  version_requirements: *2161061100
+  version_requirements: *2153593960
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2161060020 !ruby/object:Gem::Requirement
+  requirement: &2153593000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -89,10 +89,10 @@ dependencies:
         version: '1.0'
   type: :development
   prerelease: false
-  version_requirements: *2161060020
+  version_requirements: *2153593000
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161058840 !ruby/object:Gem::Requirement
+  requirement: &2153592120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -100,7 +100,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161058840
+  version_requirements: *2153592120
 description: Allows you to generate a new Ruby plugin project, build it, test it in
   Jenkins and release it to the Jenkins Update Center.
 email:
@@ -142,7 +142,7 @@ files:
 - lib/jenkins/plugin/tools/templates/release-pom.xml.erb
 - lib/jenkins/plugin/version.rb
 - lib/jenkins/rake.rb
-homepage: https://github.com/jenkinsci/jpi.rb
+homepage: https://github.com/jenkinsci/jenkins.rb/tree/master/ruby-tools/jpi
 licenses: []
 post_install_message: 
 rdoc_options: []