jenkins-plugin 0.1.15 → 0.1.16

data/jenkins-plugin.gemspec

@@ -10,7 +10,7 @@ Gem::Specification.new do |s|
   s.email       = ["cowboyd@thefrontside.net"]
   s.homepage    = "http://github.com/cowboyd/jenkins-plugin"
   s.summary     = %q{Tools for creating and building Jenkins Ruby plugins}
-  s.description = %q{I'll think of a better description later, but if you're reading this, then I haven't}
+  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.}
 
   s.rubyforge_project = "jenkins-plugin"
 
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
   s.add_dependency "jenkins-war", ">= 1.427"
   s.add_dependency "bundler", "~> 1.1.rc"
-  s.add_dependency "jenkins-plugin-runtime", "~> 0.1.6"
+  s.add_dependency "jenkins-plugin-runtime", "~> 0.1.13"
 
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "cucumber", "~> 1.0"

data/lib/jenkins/jenkins-ci.org/credential.rb

@@ -0,0 +1,39 @@
+module Jenkins
+  class CiOrg
+    # credential to access jenkins-ci.org
+    # TODO: move it elsewhere
+    class Credential
+      CREDENTIAL = File.expand_path("~/.jenkins-ci.org")
+
+      def initialize
+        @props = {}
+
+        if File.exists?(CREDENTIAL) then
+          File.open(CREDENTIAL,'r') do |f|
+            f.each_line do |l|
+              if l[0]=='#' then
+                return  # comment
+              end
+
+              k,v = l.split("=",2)
+              @props[k]=v.strip
+            end
+          end
+        end
+      end
+
+      # do we already have the credential?
+      def has_credential?
+        @props["userName"] && @props["password"]
+      end
+
+      def user_name
+        @props["userName"]
+      end
+
+      def password
+        @props["password"]
+      end
+    end
+  end
+end

data/lib/jenkins/plugin/cli.rb

@@ -19,7 +19,9 @@ module Jenkins
       desc "build", "build plugin into .hpi file suitable for distribution"
       def build
         require 'jenkins/plugin/tools/package'
-        Tools::Package.new("pkg").build
+        pkg = Tools::Package.new(spec, "pkg")
+        pkg.build
+        pkg
       end
 
       desc "server", "run a test server with plugin"
@@ -33,6 +35,14 @@ module Jenkins
       end
       map "s" => "server"
 
+      desc "release", "release to jenkins-ci.org"
+      method_option :release, :desc => "deploy as a release (as opposed to a snapshot)", :type => :boolean
+      def release
+        require 'jenkins/plugin/tools/release'
+
+        Tools::Release.new(spec,build().file_name, !options[:release]).run
+      end
+
       desc "version", "show jpi version information"
       def version
         require 'jenkins/plugin/version'

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

@@ -16,10 +16,24 @@ module Jenkins
         end
 
         def create_pluginspec
-          template('templates/pluginspec.tt', "#{name}/#{name}.pluginspec")
+          git_name = %x[git config user.name].chomp
+          git_email = %x[git config user.email].chomp
+
+          developer_id = git_email.split('@', 2).first || ''
+
+          # Fallback values.
+          git_name = 'TODO: Put your realname here' if git_name.empty?
+          git_email = 'email@example.com' if git_email.empty?
+
+          opts = {
+            :developer_id => developer_id.empty? ? 'TODO: Put your jenkins-ci.org username here.' : developer_id,
+            :developer_name => "#{git_name} <#{git_email}>"
+          }
+
+          template('templates/pluginspec.tt', "#{name}/#{name}.pluginspec", opts)
         end
 
       end
     end
   end
-end
+end

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

@@ -1,4 +1,4 @@
 
 source :rubygems
 
-gem "jenkins-plugin-runtime", "~> 0.1.8"
+gem "jenkins-plugin-runtime", "~> 0.1.13"

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

@@ -1,9 +1,28 @@
 
 Jenkins::Plugin::Specification.new do |plugin|
-  plugin.name = '<%= name %>'
+  plugin.name = <%= name.inspect %>
+  plugin.display_name = <%= (name.capitalize + " Plugin").inspect %>
   plugin.version = '0.0.1'
   plugin.description = 'enter description here'
 
-  plugin.depends_on 'ruby-runtime', '0.3'
+  # 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'
+
+  # 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'
+
+  # This is a required dependency for every ruby plugin.
+  plugin.depends_on 'ruby-runtime', '0.4'
+
+  # This is a sample dependency for a Jenkins plugin, 'git'.
   plugin.depends_on 'git', '1.1.11'
-end
+end

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

@@ -2,6 +2,7 @@
 #require 'jenkins/plugin/version'
 
 require 'jenkins/plugin/version'
+require 'etc'
 
 module Jenkins
   class Plugin
@@ -18,15 +19,16 @@ module Jenkins
           w.put "Created-By", Jenkins::Plugin::VERSION
           w.put "Build-Ruby-Platform", RUBY_PLATFORM
           w.put "Build-Ruby-Version", RUBY_VERSION
+          w.put "Built-By", Etc.getlogin()
 
           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
+          w.put "Long-Name", @spec.display_name
+          w.put "Url", @spec.url
 
           w.put "Plugin-Class", "ruby.RubyPlugin"
           w.put "Plugin-Version", @spec.version
-          w.put "Jenkins-Version", "1.426"
+          w.put "Jenkins-Version", "1.432"
 
           w.put "Plugin-Dependencies", @spec.dependencies.map{|k,v| "#{k}:#{v}"}.join(",")
         end

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

@@ -7,19 +7,23 @@ module Jenkins
     module Tools
       class Package
 
-        def initialize(target)
+        def initialize(spec,target)
           @target = target
+          @spec = spec
+        end
+
+        # where to generate the package?
+        def file_name
+          file_name = "#{@target}/#{@spec.name}.hpi"
         end
 
         def build
           FileUtils.mkdir_p @target
-          spec = Jenkins::Plugin::Specification.find!
 
           Bundle.new(@target).install
 
-          manifest = Manifest.new(spec)
+          manifest = Manifest.new(@spec)
 
-          file_name = "#{@target}/#{spec.name}.hpi"
           File.delete file_name if File.exists?(file_name)
 
           Zip::ZipFile.open(file_name, Zip::ZipFile::CREATE) do |zipfile|
@@ -47,7 +51,7 @@ module Jenkins
               end
             end
           end
-          puts "#{spec.name} plugin #{spec.version} built to #{file_name}"
+          puts "#{@spec.name} plugin #{@spec.version} built to #{file_name}"
 
         end
       end

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

@@ -0,0 +1,70 @@
+require 'jenkins/plugin/tools/bundle'
+require 'jenkins/plugin/tools/manifest'
+require 'jenkins/jenkins-ci.org/credential'
+require 'net/http'
+require 'erb'
+
+module Jenkins
+  class Plugin
+    module Tools
+      # task for deploying a plugin
+      class Release
+
+        def initialize(spec,hpi,snapshot)
+          @spec = spec
+          @hpi = hpi  # hpi file to release
+          @snapshot = snapshot # if true, deploy as a snapshot, otherwise as release
+        end
+
+        def check_error(rsp)
+          # in case of 401 Unauthorized, the server just resets the connection and Net::HTTP fails to parse the response,
+          # so we don't really get any meaningful error message.
+          rsp.value # TODO: is this how we check for the error?
+        end
+
+        def each_developer
+          @spec.developers.each do |id, name|
+            email = ''
+            if name =~ /^(.*)<([^>]+)>$/
+              name = $1
+              email = $2.strip
+            end
+
+            yield id, name.strip, email
+          end
+        end
+
+        def run
+          cred = Jenkins::CiOrg::Credential.new
+          if !cred.has_credential? then
+            raise Exception.new("no credential available to connect to jenkins-ci.org. Please create ~/.jenkins-ci.org. See https://wiki.jenkins-ci.org/display/JENKINS/Dot+Jenkins+Ci+Dot+Org")
+          end
+
+          http = Net::HTTP.new("maven.jenkins-ci.org",8081)
+
+          puts @snapshot ? "deploying as a snapshot" : "deploying as a release"
+          puts "Generating POM"
+          version = @snapshot ? @spec.version+"-SNAPSHOT" : @spec.version
+          pom = ERB.new(File.read(File.dirname(__FILE__)+"/templates/release-pom.xml.erb")).result(binding)
+
+          path = "/content/repositories/#{@snapshot?'snapshots':'releases'}/org/jenkins-ci/ruby-plugins/#{@spec.name}/#{version}/#{@spec.name}-#{version}"
+          req = Net::HTTP::Put.new("#{path}.pom")
+          req.body = pom
+          req.basic_auth(cred.user_name,cred.password)
+          check_error(http.request(req))
+
+          puts "Uploading #{@hpi}"
+          File.open(@hpi,'r') do |f|
+            req = Net::HTTP::Put.new("#{path}.hpi")
+            req.body_stream = f
+            req.basic_auth(cred.user_name,cred.password)
+            req.content_length = File.size(@hpi)
+            check_error(http.request(req))
+          end
+
+          puts "See http://maven.jenkins-ci.org"+File.dirname(path)
+        end
+      end
+    end
+  end
+end

data/lib/jenkins/plugin/tools/templates/release-pom.xml.erb

@@ -0,0 +1,54 @@
+<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/maven-v4_0_0.xsd">
+  <modelVersion>4.0.0</modelVersion>
+  <parent>
+    <groupId>org.jenkins-ci.plugins</groupId>
+    <artifactId>plugin</artifactId>
+    <version>1.420</version>
+  </parent>
+
+  <groupId>org.jenkins-ci.ruby-plugins</groupId>
+  <artifactId><%= @spec.name %></artifactId>
+  <version><%= version %></version>
+  <name><%= @spec.display_name %></name>
+  <description><%= @spec.description %></description>
+  <packaging>hpi</packaging>
+
+<% if @spec.url %>
+  <url><%= @spec.url %></url>
+<% end %>
+
+  <repositories>
+    <repository>
+      <id>m.g.o-public</id>
+      <url>http://maven.glassfish.org/content/groups/public/</url>
+    </repository>
+  </repositories>
+
+  <developers>
+<% each_developer do |id, name, email| %>
+    <developer>
+      <id><%= id %></id>
+      <name><%= name %></name>
+<%  if not email.empty? %>
+      <email><%= email %></email>
+<%  end %>
+    </developer>
+<% end %>
+  </developers>
+
+  <dependencies>
+<% @spec.dependencies.each do |k,v| %>
+    <dependency>
+      <groupId>org.jenkins-ci.plugins</groupId><!-- TODO: needs to figure out correct groupId -->
+      <artifactId><%= k %></artifactId>
+      <version><%= v %></version>
+    </dependency>
+<% end %>
+  </dependencies>
+
+<% if @spec.repository %>
+  <scm>
+    <connection>scm:<%= @spec.repository[:type] %>:<%= @spec.repository[:url] %></connection>
+  </scm>
+<% end %>
+</project>

data/lib/jenkins/plugin/version.rb

@@ -1,5 +1,5 @@
 module Jenkins
   class Plugin
-    VERSION = "0.1.15"
+    VERSION = "0.1.16"
   end
 end

data/lib/jenkins/rake.rb

@@ -37,7 +37,7 @@ module Jenkins
       desc "package up stuff into HPI file"
       task :package do
         require 'jenkins/plugin/tools/package'
-        Jenkins::Plugin::Tools::Package.new("pkg").build
+        Jenkins::Plugin::Tools::Package.new(Jenkins.spec,"pkg").build
       end
 
       desc "run a Jenkins server with this plugin"

metadata

@@ -2,7 +2,7 @@
 name: jenkins-plugin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.15
+  version: 0.1.16
 platform: ruby
 authors: 
   - Charles Lowell
@@ -10,8 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-10 00:00:00 -08:00
-default_executable: 
+date: 2011-11-14 00:00:00 Z
 dependencies: 
   - !ruby/object:Gem::Dependency 
     name: rubyzip
@@ -65,7 +64,7 @@ dependencies:
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
-            version: 0.1.6
+            version: 0.1.13
     type: :runtime
     version_requirements: *id005
   - !ruby/object:Gem::Dependency 
@@ -90,7 +89,7 @@ dependencies:
             version: "1.0"
     type: :development
     version_requirements: *id007
-description: I'll think of a better description later, but if you're reading this, then I haven't
+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: 
   - cowboyd@thefrontside.net
 executables: 
@@ -110,6 +109,7 @@ files:
   - features/support/directory_structure.rb
   - features/support/work.rb
   - jenkins-plugin.gemspec
+  - lib/jenkins/jenkins-ci.org/credential.rb
   - lib/jenkins/plugin/cli.rb
   - lib/jenkins/plugin/cli/formatting.rb
   - lib/jenkins/plugin/cli/generate.rb
@@ -122,11 +122,12 @@ files:
   - lib/jenkins/plugin/tools/loadpath.rb
   - lib/jenkins/plugin/tools/manifest.rb
   - lib/jenkins/plugin/tools/package.rb
+  - lib/jenkins/plugin/tools/release.rb
   - lib/jenkins/plugin/tools/resolver.rb
   - lib/jenkins/plugin/tools/server.rb
+  - lib/jenkins/plugin/tools/templates/release-pom.xml.erb
   - lib/jenkins/plugin/version.rb
   - lib/jenkins/rake.rb
-has_rdoc: true
 homepage: http://github.com/cowboyd/jenkins-plugin
 licenses: []
 
@@ -150,9 +151,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jenkins-plugin
-rubygems_version: 1.5.1
+rubygems_version: 1.8.9
 signing_key: 
 specification_version: 3
 summary: Tools for creating and building Jenkins Ruby plugins
-test_files: []
-
+test_files: 
+  - features/create-new-plugin.feature
+  - features/support/create_new_plugin_steps.rb
+  - features/support/directory_structure.rb
+  - features/support/work.rb