jenkins-plugin 0.1.12 → 0.1.13

data/lib/jenkins/plugin/cli.rb

@@ -18,15 +18,17 @@ module Jenkins
 
       desc "build", "build plugin into .hpi file suitable for distribution"
       def build
-        shell.say "TODO: build()"
+        require 'jenkins/plugin/tools/package'
+        Tools::Package.new("pkg").build
       end
 
       desc "server", "run a test server with plugin"
       method_option :home, :desc => "set server work directory", :default => 'work'
       method_option :port, :desc => "server http port (currently ignored)", :default => 8080
+      method_option :war,  :desc => "specify a custom jenkins.war to run the plugin with"
       def server
         require 'jenkins/plugin/tools/server'
-        server = Jenkins::Plugin::Tools::Server.new(spec, options[:home])
+        server = Tools::Server.new(spec, options[:home], options[:war])
         server.run!
       end
       map "s" => "server"

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

@@ -0,0 +1,58 @@
+
+module Jenkins
+  class Plugin
+    module Tools
+      class Bundle
+
+        def initialize(target)
+          @target = target
+        end
+
+        def install
+          require 'java'
+          require 'bundler'
+          require 'bundler/cli'
+          puts "bundling..."
+          ENV['BUNDLE_APP_CONFIG'] = "#{@target}/vendor/bundle"
+          Bundler::CLI.start ["--path", "#{@target}/vendor/gems", "--without", "development"]
+
+          generate_standalone([])
+        end
+
+        # this code lifted from Bundler::Installer v1.1, so that it will work with 1.0
+        def generate_standalone(groups)
+         standalone_path = Bundler.settings[:path]
+         bundler_path = File.join(standalone_path, "bundler")
+         FileUtils.mkdir_p(bundler_path)
+
+         paths = []
+
+         if groups.empty?
+           specs = Bundler.definition.requested_specs
+         else
+           specs = Bundler.definition.specs_for groups.map { |g| g.to_sym }
+         end
+
+         specs.each do |spec|
+           next if spec.name == "bundler"
+
+           spec.require_paths.each do |path|
+             full_path = File.join(spec.full_gem_path, path)
+             paths << Pathname.new(full_path).relative_path_from(Bundler.root.join(bundler_path))
+           end
+         end
+
+
+         File.open File.join(bundler_path, "setup.rb"), "w" do |file|
+           file.puts "path = File.expand_path('..', __FILE__)"
+           paths.each do |path|
+             file.puts %{$:.unshift File.expand_path("\#{path}/#{path}")}
+           end
+         end
+       end
+
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'jenkins/plugin/tools/bundle'
+require 'jenkins/plugin/tools/manifest'
+require 'zip/zip'
+
+module Jenkins
+  class Plugin
+    module Tools
+      class Package
+
+        def initialize(target)
+          @target = target
+        end
+
+        def build
+          FileUtils.mkdir_p @target
+          spec = Jenkins::Plugin::Specification.find!
+
+          Bundle.new(@target).install
+
+          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|
+            zipfile.get_output_stream("META-INF/MANIFEST.MF") do |f|
+              manifest.write_hpi(f)
+              f.puts "Bundle-Path: vendor/gems"
+            end
+            zipfile.mkdir("WEB-INF/classes")
+
+            ["lib","models","views", "#{@target}/vendor"].each do |d|
+              Dir.glob("#{d}/**/*") do |f|
+                if !File.directory? f
+                  zipfile.add("WEB-INF/classes/#{f.gsub("#{@target}/",'')}",f)
+                end
+              end
+            end
+          end
+          puts "#{spec.name} plugin #{spec.version} built to #{file_name}"
+
+        end
+      end
+    end
+  end
+end

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

@@ -9,10 +9,11 @@ module Jenkins
     module Tools
       class Server
 
-        def initialize(spec, workdir)
+        def initialize(spec, workdir, war)
           @spec = spec
           @workdir = workdir
           @plugindir = "#{workdir}/plugins"
+          @war = war || Jenkins::War::LOCATION
         end
 
         def run!
@@ -36,11 +37,13 @@ module Jenkins
           args << "-DJENKINS_HOME=#{@workdir}"
           args << "-Dstapler.trace=true"
           args << "-Ddebug.YUI=true"
+#          args << "-Djruby.debug.loadService=true"
+#          args << "-Djruby.debug.loadService.timing=true"
           args << "-jar"
-          args << Jenkins::War::LOCATION
+          args << @war
           exec *args
         end
       end
     end
   end
-end
+end

data/lib/jenkins/plugin/version.rb

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

data/lib/jenkins/rake.rb

@@ -34,41 +34,10 @@ module Jenkins
         puts loadpath.to_path
       end
 
-      directory target = "pkg"
-      desc "bundle gems"
-      task :bundle => [target] do
-        fail "we still need to backport some features from bundler 1.1 prereleases for this feature to work"
-        require 'java'
-        require 'bundler'
-        require 'bundler/cli'
-
-        puts "bundling..."
-        ENV['BUNDLE_APP_CONFIG'] = "#{target}/vendor/bundle"
-        Bundler::CLI.start ["--standalone", "--path", "#{target}/vendor/gems", "--without", "development"]
-      end
-
       desc "package up stuff into HPI file"
-      task :package => [target, :bundle] do
-
-        file_name = "#{target}/#{Jenkins.spec.name}.hpi"
-        File.delete file_name if File.exists?(file_name)
-
-        Zip::ZipFile.open(file_name, Zip::ZipFile::CREATE) do |zipfile|
-          zipfile.get_output_stream("META-INF/MANIFEST.MF") do |f|
-            Jenkins.generate_manifest(f)
-            f.puts "Bundle-Path: vendor/gems"
-          end
-          zipfile.mkdir("WEB-INF/classes")
-
-          ["lib","models","views", "#{target}/vendor"].each do |d|
-            Dir.glob("#{d}/**/*") do |f|
-              if !File.directory? f
-                zipfile.add("WEB-INF/classes/#{f.gsub("#{target}/",'')}",f)
-              end
-            end
-          end
-        end
-        puts "#{Jenkins.spec.name} plugin #{Jenkins.spec.version} built to #{file_name}"
+      task :package do
+        require 'jenkins/plugin/tools/package'
+        Jenkins::Plugin::Tools::Package.new("pkg").build
       end
 
       desc "run a Jenkins server with this plugin"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: jenkins-plugin
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 0
   - 1
-  - 12
-  version: 0.1.12
+  - 13
+  version: 0.1.13
 platform: ruby
 authors: 
 - Charles Lowell
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-05 00:00:00 -05:00
+date: 2011-10-21 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -148,9 +148,11 @@ files:
 - lib/jenkins/plugin/cli/templates/Gemfile.tt
 - lib/jenkins/plugin/cli/templates/build_step.tt
 - lib/jenkins/plugin/cli/templates/pluginspec.tt
+- lib/jenkins/plugin/tools/bundle.rb
 - lib/jenkins/plugin/tools/hpi.rb
 - lib/jenkins/plugin/tools/loadpath.rb
 - lib/jenkins/plugin/tools/manifest.rb
+- lib/jenkins/plugin/tools/package.rb
 - lib/jenkins/plugin/tools/resolver.rb
 - lib/jenkins/plugin/tools/server.rb
 - lib/jenkins/plugin/version.rb
@@ -185,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: jenkins-plugin
-rubygems_version: 1.6.2
+rubygems_version: 1.6.0
 signing_key: 
 specification_version: 3
 summary: Tools for creating and building Jenkins Ruby plugins