jenkins-plugin 0.1.5 → 0.1.6

data/bin/jpi

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'jpi/cli'
+require 'jenkins/plugin/cli'
 
-JPI::CLI.start
+Jenkins::Plugin::CLI.start ARGV

data/jenkins-plugin.gemspec

@@ -23,6 +23,7 @@ Gem::Specification.new do |s|
   s.add_dependency "thor"
   s.add_dependency "jenkins-war", ">= 1.427"
   s.add_dependency "bundler", "~> 1.0.0"
+  s.add_dependency "jenkins-plugin-runtime", "~> 0.1.6"
 
   s.add_development_dependency "rspec", "~> 2.0"
   s.add_development_dependency "cucumber", "~> 1.0"

data/lib/jenkins/plugin/cli.rb

@@ -0,0 +1,41 @@
+
+require 'thor'
+require 'jenkins/plugin/specification'
+require 'jenkins/plugin/cli/formatting'
+
+
+module Jenkins
+  class Plugin
+    class CLI < Thor
+      extend Formatting
+
+      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
+      def server
+        require 'jenkins/plugin/tools/server'
+        server = Jenkins::Plugin::Tools::Server.new(spec, options[:home])
+        server.run!
+      end
+
+      desc "version", "show jpi version information"
+      def version
+        require 'jenkins/plugin/version'
+        shell.say Jenkins::Plugin::VERSION
+      end
+      map ["-v","--version"] => "version"
+
+      desc "help [COMMAND]", "get help for COMMAND, or for jpi itself"
+      def help(command = nil)
+        super
+      end
+
+      private
+
+      def spec
+        Specification.find!
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,54 @@
+
+module Jenkins
+  class Plugin
+    class CLI < Thor
+      module Formatting
+        def task_help(shell, task_name)
+          meth = normalize_task_name(task_name)
+          task = all_tasks[meth]
+          handle_no_task_error(meth) unless task
+
+          shell.say "usage: #{banner(task)}"
+          shell.say
+          class_options_help(shell, nil => task.options.map { |_, o| o })
+        end
+
+
+        def print_options(shell, options, grp = nil)
+          return if options.empty?
+          table = options.map do |option|
+            prototype = if option.default
+              " [#{option.default}]"
+            elsif option.type == :boolean
+              ""
+            elsif option.required?
+              " #{option.banner}"
+            else
+              " [#{option.banner}]"
+            end
+            aliases = option.aliases.empty? ? "" : option.aliases.join(" ") + ","
+            [aliases, "--#{option.name}#{prototype}", "\t",option.description]
+          end
+          shell.print_table(table, :ident => 2)
+          shell.say
+        end
+
+        def help(shell, task)
+          list = printable_tasks
+          print shell.set_color("jpi", :black, true)
+          shell.say <<-USEAGE
+- tools to create, build, develop and release Jenkins plugins
+
+Usage: jpi command [arguments] [options]
+
+USEAGE
+
+          shell.say "Commands:"
+          shell.print_table(list, :ident => 2, :truncate => true)
+          shell.say
+          class_options_help(shell)
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,45 @@
+
+module Jenkins
+  class Plugin
+    module Tools
+      class Manifest
+
+        def initialize(spec)
+          @spec = spec
+        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}"
+
+          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
+
+          io.puts "Plugin-Class: ruby.RubyPlugin"
+          io.puts "Plugin-Version: #{@spec.version}"
+          io.puts "Jenkins-Version: 1.426"
+
+          io.puts "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"
+          # Stapler expects view erb/haml scripts to be in the JVM ClassPath
+          io.puts "Class-Path: #{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"
+
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,61 @@
+require 'net/http'
+
+module Jenkins
+  class Plugin
+    module Tools
+      class Resolver
+
+        def initialize(spec, dir)
+          @spec = spec
+          @dir = dir
+          FileUtils.mkdir_p(dir) unless File.directory? @dir
+        end
+
+        def resolve!
+          @spec.dependencies.each do |name, version|
+            FileUtils.cp resolve(name, version), @dir
+          end
+        end
+
+        def resolve(short_name,version)
+          # this is where we expect the retrieved file to be
+          cache = File.expand_path "~/.jenkins/cache/plugins/#{short_name}/#{version}/#{short_name}.hpi"
+
+          return cache if File.exists?(cache)
+
+          # now we start looking for places to find them
+
+          # is it in the local maven2 repository?
+          maven = File.expand_path "~/.m2/repository/org/jenkins-ci/plugins/#{short_name}/#{version}/#{short_name}-#{version}.hpi"
+          return maven if File.exists?(maven)
+
+          # download from the community update center
+          FileUtils.mkdir_p(File.dirname(cache))
+          open(cache+".tmp","wb") do |f|
+            puts "Downloading #{short_name} #{version}"
+            url = "http://updates.jenkins-ci.org/download/plugins/#{short_name}/#{version}/#{short_name}.hpi?for=ruby-plugin"
+            puts "  from #{url}"
+            f.write fetch(url).body
+          end
+          FileUtils.mv cache+".tmp", cache
+
+          return cache
+        end
+
+        # download with redirect support
+        def fetch(uri, limit = 10)
+          # You should choose better exception.
+          raise ArgumentError, 'HTTP redirect too deep' if limit == 0
+
+          response = Net::HTTP.get_response(URI.parse(uri))
+          case response
+          when Net::HTTPSuccess     then response
+          when Net::HTTPRedirection then fetch(response['location'], limit - 1)
+          else
+            response.error!
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,46 @@
+require 'jenkins/plugin/tools/loadpath'
+require 'jenkins/plugin/tools/resolver'
+require 'jenkins/plugin/tools/manifest'
+require 'jenkins/war'
+require 'fileutils'
+
+module Jenkins
+  class Plugin
+    module Tools
+      class Server
+
+        def initialize(spec, workdir)
+          @spec = spec
+          @workdir = workdir
+          @plugindir = "#{workdir}/plugins"
+        end
+
+        def run!
+          FileUtils.mkdir_p(@plugindir)
+          loadpath = Jenkins::Plugin::Tools::Loadpath.new
+          manifest = Jenkins::Plugin::Tools::Manifest.new(@spec)
+          resolver = Jenkins::Plugin::Tools::Resolver.new(@spec, @plugindir)
+
+          resolver.resolve!
+          # generate the plugin manifest
+
+          File.open("#{@plugindir}/#{@spec.name}.hpl",mode="w+") do |f|
+            manifest.write_hpl(f, loadpath)
+          end
+
+
+          # execute Jenkins
+          args = []
+          args << "java"
+          args << "-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n"
+          args << "-DJENKINS_HOME=#{@workdir}"
+          args << "-Dstapler.trace=true"
+          args << "-Ddebug.YUI=true"
+          args << "-jar"
+          args << Jenkins::War::LOCATION
+          exec *args
+        end
+      end
+    end
+  end
+end

data/lib/jenkins/plugin/version.rb

@@ -1,5 +1,5 @@
 module Jenkins
   class Plugin
-    VERSION = "0.1.5"
+    VERSION = "0.1.6"
   end
 end

data/lib/jenkins/rake.rb

@@ -11,26 +11,6 @@ module Jenkins
     @spec ||= Jenkins::Plugin::Specification.load(Dir['*.pluginspec'].first)
   end
 
-  def self.generate_manifest(f)
-    f.puts "Manifest-Version: 1.0"
-    f.puts "Created-By: #{Jenkins::Plugin::VERSION}"
-    f.puts "Build-Ruby-Platform: #{RUBY_PLATFORM}"
-    f.puts "Build-Ruby-Version: #{RUBY_VERSION}"
-
-    f.puts "Group-Id: org.jenkins-ci.plugins"
-    f.puts "Short-Name: #{Jenkins.spec.name}"
-    f.puts "Long-Name: #{Jenkins.spec.name}" # TODO: better name
-    f.puts "Url: http://jenkins-ci.org/" # TODO: better value
-    # f.puts "Compatible-Since-Version:"
-    f.puts "Plugin-Class: ruby.RubyPlugin"
-    f.puts "Plugin-Version: #{Jenkins.spec.version}"
-    f.puts "Jenkins-Version: 1.426"
-
-    f.puts "Plugin-Dependencies: " + Jenkins.spec.dependencies.map{|k,v| "#{k}:#{v}"}.join(",")
-    # f.puts "Plugin-Developers:"
-  end
-
-
   class Rake
     def self.install_tasks
       self.new.install
@@ -48,13 +28,6 @@ module Jenkins
         sh "rm -rf vendor"
       end
 
-      # verify that necessary metadata constants are defined
-      task :verify_constants do
-        ["PluginName","PluginVersion"].each do |n|
-          fail("Constant #{n} is not defined") unless Object.const_defined?(n)
-        end
-      end
-
       desc "output the development servers loadpath"
       task :loadpath do
         loadpath = Jenkins::Plugin::Tools::Loadpath.new(:default)
@@ -75,7 +48,7 @@ module Jenkins
       end
 
       desc "package up stuff into HPI file"
-      task :package => [:verify_constants, target, :bundle] do
+      task :package => [target, :bundle] do
 
         file_name = "#{target}/#{Jenkins.spec.name}.hpi"
         File.delete file_name if File.exists?(file_name)
@@ -98,53 +71,13 @@ module Jenkins
         puts "#{Jenkins.spec.name} plugin #{Jenkins.spec.version} built to #{file_name}"
       end
 
-      desc "resolve dependency plugins into #{work}/plugins"
-      task :'resolve-dependency-plugins' => [work] do
-        FileUtils.mkdir_p("#{work}/plugins")
-
-        puts "Copying plugin dependencies into #{work}/plugins"
-        Jenkins.spec.dependencies.each do |short_name,version|
-          FileUtils.cp Jenkins::Plugin::Tools::Hpi::resolve(short_name,version), "#{work}/plugins/#{short_name}.hpi", :verbose=>true
-        end
-      end
-
       desc "run a Jenkins server with this plugin"
-      task :server => :'resolve-dependency-plugins' do
-        require 'jenkins/war'
-        require 'zip/zip'
-        require 'fileutils'
-
-        loadpath = Jenkins::Plugin::Tools::Loadpath.new
-
-        # generate the plugin manifest
-        FileUtils.mkdir_p("#{work}/plugins")
-        File.open("#{work}/plugins/#{Jenkins.spec.name}.hpl",mode="w+") do |f|
-          Jenkins.generate_manifest f
+      task :server do
+        require 'jenkins/plugin/tools/server'
 
-          f.puts "Load-Path: #{loadpath.to_a.join(':')}"
-          f.puts "Lib-Path: #{Dir.pwd}/lib/"
-          f.puts "Models-Path: #{Dir.pwd}/models"
-          # Stapler expects view erb/haml scripts to be in the JVM ClassPath
-          f.puts "Class-Path: #{Dir.pwd}/views"
-          # Directory for static images, javascript, css, etc. of this plugin.
-          # The static resources are mapped under #CONTEXTPATH/plugin/SHORTNAME/
-          f.puts "Resource-Path: #{Dir.pwd}/static"
-        end
-
-        # TODO: assemble dependency plugins
-
-        # execute Jenkins
-        args = []
-        args << "java"
-        args << "-Xrunjdwp:transport=dt_socket,server=y,address=8000,suspend=n"
-        args << "-DJENKINS_HOME=#{work}"
-        args << "-Dstapler.trace=true"
-        args << "-Ddebug.YUI=true"
-        args << "-jar"
-        args << Jenkins::War::LOCATION
-        exec *args
+        server = Jenkins::Plugin::Tools::Server.new(Jenkins.spec, "work")
+        server.run!
       end
-
     end
   end
 end

metadata

@@ -2,7 +2,7 @@
 name: jenkins-plugin
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors: 
   - Charles Lowell
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-16 00:00:00 -05:00
+date: 2011-09-19 00:00:00 -05:00
 default_executable: 
 dependencies: 
   - !ruby/object:Gem::Dependency 
@@ -58,27 +58,38 @@ dependencies:
     type: :runtime
     version_requirements: *id004
   - !ruby/object:Gem::Dependency 
-    name: rspec
+    name: jenkins-plugin-runtime
     prerelease: false
     requirement: &id005 !ruby/object:Gem::Requirement 
+      none: false
+      requirements: 
+        - - ~>
+          - !ruby/object:Gem::Version 
+            version: 0.1.6
+    type: :runtime
+    version_requirements: *id005
+  - !ruby/object:Gem::Dependency 
+    name: rspec
+    prerelease: false
+    requirement: &id006 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "2.0"
     type: :development
-    version_requirements: *id005
+    version_requirements: *id006
   - !ruby/object:Gem::Dependency 
     name: cucumber
     prerelease: false
-    requirement: &id006 !ruby/object:Gem::Requirement 
+    requirement: &id007 !ruby/object:Gem::Requirement 
       none: false
       requirements: 
         - - ~>
           - !ruby/object:Gem::Version 
             version: "1.0"
     type: :development
-    version_requirements: *id006
+    version_requirements: *id007
 description: I'll think of a better description later, but if you're reading this, then I haven't
 email: 
   - cowboyd@thefrontside.net
@@ -96,8 +107,13 @@ files:
   - bin/jpi
   - features/create-new-plugin.feature
   - jenkins-plugin.gemspec
+  - lib/jenkins/plugin/cli.rb
+  - lib/jenkins/plugin/cli/formatting.rb
   - lib/jenkins/plugin/tools/hpi.rb
   - lib/jenkins/plugin/tools/loadpath.rb
+  - lib/jenkins/plugin/tools/manifest.rb
+  - lib/jenkins/plugin/tools/resolver.rb
+  - lib/jenkins/plugin/tools/server.rb
   - lib/jenkins/plugin/version.rb
   - lib/jenkins/rake.rb
 has_rdoc: true