bukin 0.4.0 → 0.5.0

data/README.md

@@ -34,8 +34,15 @@ You can specify specific versions of a plugin or server to install.  Craftbukkit
     plugin 'worldedit', '5.5.5'
     plugin 'worldguard', '5.7.3'
 
+By default, bukin will try to download jar files from bukkit dev.  If only zip files are available, it will automatically extract all jar files from it.  If you want to specify what files are extracted from a zip file, use the `extract` option.  It takes a [ruby regular expression](http://ruby-doc.org/core-1.9.3/Regexp.html) used to match file names in the zip file.
+
+    plugin 'permissionsex', '1.19.5', :extract => /PermissionsEx.*\.jar/
+
+Plugins or servers can also be downloaded from Jenkins. Just specify the base url for Jenkins and a [ruby regular expression](http://ruby-doc.org/core-1.9.3/Regexp.html) matching the file you want to download.  If no file is specified, bukin will download the first one listed.
+
+    server 'spigot', 'build-844', :jenkins => 'http://ci.md-5.net', :file => /spigot\.jar/
+
 Need something custom?  Use the `download` option.  Version is optional but will display when the plugin is downloading.
 
-    server 'craftbukkit', 'spigot-735', download: 'http://ci.md-5.net/job/Spigot/735/artifact/Spigot-Server/target/spigot.jar'
-    plugin 'mycustomplugin', '2.4', download: 'http://example.com/My-Custom-Plugin.jar'
+    plugin 'mycustomplugin', '2.4', :download => 'http://example.com/My-Custom-Plugin.jar'
 

data/lib/bukin/bukfile.rb

@@ -30,7 +30,7 @@ class Bukin::Bukfile
     options = args.last.is_a?(Hash) ? args.pop : {}
     version = args.pop || nil
 
-    @server_info = { name: name, version: version }.merge(options)
+    @server_info = { :name => name, :version => version }.merge(options)
   end
 
   def plugin(name, *args)
@@ -41,6 +41,6 @@ class Bukin::Bukfile
     options = args.last.is_a?(Hash) ? args.pop : {}
     version = args.pop || nil
 
-    @plugins_info << { name: name, version: version }.merge(options)
+    @plugins_info << { :name => name, :version => version }.merge(options)
   end
 end

data/lib/bukin/cli.rb

@@ -3,6 +3,8 @@ require 'bukin/installer'
 require 'bukin/bukfile'
 require 'bukin/providers/bukget'
 require 'bukin/providers/bukkit_dl'
+require 'bukin/providers/direct_dl'
+require 'bukin/providers/jenkins'
 
 class Bukin::CLI < Thor
 
@@ -17,20 +19,58 @@ class Bukin::CLI < Thor
     plugins = bukfile.plugins_info
 
     # Grab information from the various providers
+    direct_dl = Bukin::DirectDl.new
+    jenkins = Bukin::Jenkins.new
     bukkit_dl = Bukin::BukkitDl.new
     bukget = Bukin::Bukget.new
 
-    section "Fetching information from #{bukkit_dl.url}" do
-      bukkit_dl.resolve_info(server)
+    # Server info
+    if direct_dl.usable(server)
+      direct_dl.resolve_info(server)
+    elsif jenkins.usable(server)
+      section "Fetching information from #{jenkins.url(server)}" do
+        jenkins.resolve_info(server)
+      end
+    else
+      section "Fetching information from #{bukkit_dl.url}" do
+        bukkit_dl.resolve_info(server)
+      end
+    end
+
+    # Plugins info
+    direct_dl_plugins = []
+    jenkins_plugins = []
+    bukget_plugins = []
+
+    plugins.each do |plugin|
+      if direct_dl.usable(plugin)
+        direct_dl_plugins << plugin
+      elsif jenkins.usable(plugin)
+        jenkins_plugins << plugin
+      else
+        bukget_plugins << plugin
+      end
+    end
+
+    direct_dl_plugins.each do |plugin|
+      direct_dl.resolve_info(plugin)
+    end
+
+    jenkins_plugins.each do |plugin|
+      section "Fetching information from #{jenkins.url(plugin)}" do
+        jenkins.resolve_info(plugin)
+      end
     end
 
     section "Fetching information from #{bukget.url}" do
-      plugins.map do |plugin|
-        plugin[:server] ||= server[:name]
-        begin
-          bukget.resolve_info(plugin)
-        rescue OpenURI::HTTPError => ex
-          raise Bukin::BukinError, "There was an error downloading #{plugin[:name]} (#{plugin[:version]}).\n#{ex.message}"
+      bukget_plugins.each do |plugin|
+        plugins.each do |plugin|
+          plugin[:server] ||= 'craftbukkit'
+          begin
+            bukget.resolve_info(plugin)
+          rescue OpenURI::HTTPError => ex
+            raise Bukin::BukinError, "There was an error downloading #{plugin[:name]} (#{plugin[:version]}).\n#{ex.message}"
+          end
         end
       end
     end
@@ -39,12 +79,12 @@ class Bukin::CLI < Thor
     installer = Bukin::Installer.new(Dir.pwd, true)
 
     downloading server[:name], server[:display_version] do
-      installer.install(:server, bukkit_dl, server)
+      installer.install(:server, server)
     end
 
     plugins.each do |plugin|
       downloading plugin[:name], plugin[:version] do
-        installer.install(:plugin, bukget, plugin)
+        installer.install(:plugin, plugin)
       end
     end
   end

data/lib/bukin/installer.rb

@@ -7,10 +7,10 @@ class Bukin::Installer
     if use_lockfile
       @lockfile = Bukin::Lockfile.new
     end
-    @paths = { server: path, plugin: "#{path}/plugins" }
+    @paths = { :server => path, :plugin => "#{path}/plugins" }
   end
 
-  def install(type, provider, data)
+  def install(type, data)
     unless @paths.keys.include?(type)
       raise(ArgumentError, "You must specify one of the following types to install: #{@paths.keys.to_s}")
     end
@@ -41,12 +41,12 @@ class Bukin::Installer
 
   def extract_files(file_data, path, match)
     file_names = []
-    file = Tempfile.new('bukin')
+    tempfile = Tempfile.new('bukin')
     begin
-      file.write(file_data)
-      file.close
+      tempfile.write(file_data)
+      tempfile.close
 
-      Zip::ZipFile.open(file.path) do |zipfile|
+      Zip::ZipFile.open(tempfile.path) do |zipfile|
         jars = zipfile.find_all {|file| file.name =~ match}
         jars.each do |file|
           file.extract(path + '/' + file.name) { true }
@@ -54,8 +54,8 @@ class Bukin::Installer
         end
       end
     ensure
-      file.close
-      file.unlink
+      tempfile.close
+      tempfile.unlink
     end
     file_names
   end

data/lib/bukin/providers/bukkit_dl.rb

@@ -15,11 +15,6 @@ class Bukin::BukkitDl
   end
 
   def resolve_info(data)
-    if data[:download]
-      data[:display_version] = data[:version]
-      return data
-    end
-
     name = data[:name]
     version = data[:version] || 'latest-rb'
 

data/lib/bukin/providers/direct_dl.rb

@@ -0,0 +1,12 @@
+
+# Api for direct downloads
+class Bukin::DirectDl
+  def usable(data)
+    !!data[:download]
+  end
+
+  def resolve_info(data)
+    data[:display_version] = data[:version]
+    data
+  end
+end

data/lib/bukin/providers/jenkins.rb

@@ -0,0 +1,38 @@
+require 'json'
+
+# Api for downloading from jenkins
+class Bukin::Jenkins
+  
+  def usable(data)
+    !!data[:jenkins]
+  end
+
+  def url(data)
+    data[:jenkins]
+  end
+
+  def resolve_info(data)
+    name = data[:name]
+    version = data[:version] || 'lastSuccessfulBuild'
+
+    if version =~ /^build-(.*)$/
+      base_path = "#{data[:jenkins]}/job/#{name}/#{$1}"
+      url = "#{base_path}/api/json"
+      info = JSON.parse(open(url).read)
+
+      download_info = if data[:file]
+                        info['artifacts'].find do |artifact| 
+                          artifact['fileName'] =~ data[:file]
+                        end
+                      else
+                        info['artifacts'].first
+                      end
+
+      data[:version] = data[:display_version] = version
+      data[:download] = "#{base_path}/artifact/#{download_info['relativePath']}"
+    else
+      raise Bukin::InstallError, "The plugin #{name} (#{version}) has an improper version format for downloading from Jenkins.  It should be in the form of 'build-<number>'"
+    end
+    data
+  end
+end

data/lib/bukin/utils.rb

@@ -11,12 +11,11 @@ end
 def download_file(url, content_disposition = false)
   open(url, "User-Agent" => "Bukin #{Bukin::VERSION}") do |download|
     file_name = if download.meta['content-disposition']
-                  download.meta['content-disposition']
-                          .match(/filename=(\"?)(.+)\1/)[2]
-                          .force_encoding("UTF-8")
+                  download.meta['content-disposition'].match(/filename=(\"?)(.+)\1/)[2]
                 else
                   File.basename(url)
                 end
+    file_name = file_name.force_encoding('UTF-8') if file_name.respond_to?(:force_encoding)
     data = download.read
     return data, file_name
   end

data/lib/bukin/version.rb

@@ -1,3 +1,3 @@
 module Bukin
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bukin
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -83,6 +83,8 @@ files:
 - lib/bukin/lockfile.rb
 - lib/bukin/providers/bukget.rb
 - lib/bukin/providers/bukkit_dl.rb
+- lib/bukin/providers/direct_dl.rb
+- lib/bukin/providers/jenkins.rb
 - lib/bukin/utils.rb
 - lib/bukin/version.rb
 homepage: http://github.com/Nullreff/bukin