bukin 0.2.0 → 0.3.0

data/README.md

@@ -1,3 +1,6 @@
 # Bukin
 
 Plugin and server package manager for Minecraft
+
+[![Dependency Status](https://gemnasium.com/Nullreff/bukin.png)](https://gemnasium.com/Nullreff/bukin)
+[![Code Climate](https://codeclimate.com/github/Nullreff/bukin.png)](https://codeclimate.com/github/Nullreff/bukin)

data/lib/bukin.rb

@@ -1,6 +1,7 @@
 require 'bukin/version'
 require 'bukin/cli'
 require 'bukin/friendly_errors'
+require 'bukin/exceptions'
 
 module Bukin
 end

data/lib/bukin/bukfile.rb

@@ -22,15 +22,25 @@ class Bukin::Bukfile
     @plugins_info = []
   end
 
-  def server(name, version = 'latest-rb')
-    unless @server_info
-      @server_info = { name: name, version: version }
-    else
+  def server(name, *args)
+    if @server_info
       abort("Error: There is more than one server declared in your #{FILE_NAME}")
     end
+
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    version = args.pop || nil
+
+    @server_info = { name: name, version: version }.merge(options)
   end
 
-  def plugin(name, version = 'latest')
-    @plugins_info << { name: name, version: version }
+  def plugin(name, *args)
+    if @plugins_info.find { |p| p[:name] == name }
+      abort("Error: You declared the plugin #{name} more than once in your #{FILE_NAME}")
+    end
+
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    version = args.pop || nil
+
+    @plugins_info << { name: name, version: version }.merge(options)
   end
 end

data/lib/bukin/cli.rb

@@ -21,28 +21,26 @@ class Bukin::CLI < Thor
     bukget = Bukin::Bukget.new
 
     section "Fetching information from #{bukkit_dl.url}" do
-      info = bukkit_dl.info(server[:name], server[:version])
-      server[:download_version] = info['version']
-      server[:download_build] = "build-#{info['build_number']}"
+      bukkit_dl.resolve_info(server)
     end
 
     section "Fetching information from #{bukget.url}" do
-      plugins.each do |plugin|
-        info = bukget.info(plugin[:name], plugin[:version], server[:name])
-        plugin[:download_version] = info['versions'][0]['version']
+      plugins.map do |plugin|
+        plugin[:server] ||= server[:name]
+        bukget.resolve_info(plugin)
       end
     end
 
     # Download and install server and plugins
     installer = Bukin::Installer.new(Dir.pwd, true)
 
-    section "Downloading #{server[:name]} (#{server[:download_version]})" do
-      installer.install(:server, bukkit_dl, server[:name], server[:download_build])
+    downloading server[:name], server[:display_version] do
+      installer.install(:server, bukkit_dl, server)
     end
 
     plugins.each do |plugin|
-      section "Downloading #{plugin[:name]} (#{plugin[:download_version]})" do
-        installer.install(:plugin, bukget, plugin[:name], plugin[:download_version], server[:name])
+      downloading plugin[:name], plugin[:version] do
+        installer.install(:plugin, bukget, plugin)
       end
     end
   end
@@ -63,4 +61,10 @@ private
     say 'Error', :red
     raise ex
   end
+
+  def downloading(name, version, &block)
+    msg = "Downloading #{name}"
+    msg << " (#{version})" if version
+    section(msg, &block)
+  end
 end

data/lib/bukin/exceptions.rb

@@ -0,0 +1,5 @@
+module Bukin
+  class BukinError < StandardError; end
+  class BukfileError < BukinError; end
+  class InstallError < BukinError; end
+end

data/lib/bukin/friendly_errors.rb

@@ -3,6 +3,8 @@ require 'socket'
 module Bukin
   def self.with_friendly_errors
     yield
+  rescue BukinError => error
+    abort error.message
   rescue SocketError => error
     abort "#{error.message}\nCheck that you have a stable connection and the service is online"
   rescue Errno::ENOENT => error

data/lib/bukin/installer.rb

@@ -9,14 +9,15 @@ class Bukin::Installer
     @paths = { server: path, plugin: "#{path}/plugins" }
   end
 
-  def install(type, provider, *args)
+  def install(type, provider, data)
     unless @paths.keys.include?(type)
       raise(ArgumentError, "You must specify one of the following types to install: #{@paths.keys.to_s}")
     end
-    data, file_name = provider.download(*args)
-    save_download(data, file_name, @paths[type])
+    file_data, file_name = download_file(data[:download])
+    save_download(file_data, file_name, @paths[type])
     if @lockfile
-      @lockfile.add(type, args[0], args[1], file_name)
+      data[:file] = file_name
+      @lockfile.add(type, data)
     end
   end
 end

data/lib/bukin/lockfile.rb

@@ -15,28 +15,28 @@ class Bukin::Lockfile
     end
   end
 
-  def set_server(name, version, file)
+  def set_server(data)
     self.server = {
-      'name' => name,
-      'version' => version,
-      'file' => file
+      'name' => data[:name],
+      'version' => data[:version],
+      'file' => data[:file]
     }
   end
 
-  def add_plugin(name, version, *files)
-    self.plugins[name] = {
-      'version' => version,
-      'files' => files
+  def add_plugin(data)
+    self.plugins[data[:name]] = {
+      'version' => data[:version],
+      'files' => data[:files] || [data[:file]]
     }
     save
   end
 
-  def add(type, *args)
+  def add(type, data)
     case type
     when :server
-      set_server(*args)
+      set_server(data)
     when :plugin
-      add_plugin(*args)
+      add_plugin(data)
     else
       raise(ArgumentError, "You must specify :server or :plugin as the type when adding to a lock file")
     end

data/lib/bukin/providers/bukget.rb

@@ -1,5 +1,6 @@
 require 'bukin/utils'
 require 'json'
+require 'cgi'
 
 # BukGet api
 # Docs: http://bukget.org/pages/docs/API3.html
@@ -14,15 +15,36 @@ class Bukin::Bukget
     "#{url}/3"
   end
 
-  def download(name, version, server)
+  def resolve_info(data)
+    return data if data[:download]
+
+    name = data[:name]
+    version = data[:version] || 'latest'
+    server = data[:server]
     server = 'bukkit' if server == 'craftbukkit'
-    url = "#{api_url}/plugins/#{server}/#{name}/#{version}/download"
-    download_file(url, true)
+
+    url = "#{api_url}/plugins/#{CGI.escape(server)}/#{CGI.escape(name)}/#{CGI.escape(version)}"
+    info = JSON.parse(open(url).read)
+
+    versions = info['versions']
+    if versions.empty?
+      raise Bukin::InstallError, "The plugin #{name} (#{version}) has no available downloads from BukGet."
+    end
+
+    version_data = versions.find {|version_data| jar_extension?(version_data)}
+    if version_data
+      data[:version] = version_data['version']
+      data[:download] = version_data['download']
+    else
+      puts info
+      raise Bukin::InstallError, "The plugin #{name} (#{version}) has no jar files available for download"
+    end
+
+    data
   end
 
-  def info(name, version, server)
-    server = 'bukkit' if server == 'craftbukkit'
-    url = "#{api_url}/plugins/#{server}/#{name}/#{version}"
-    JSON.parse(open(url).read)
+  def jar_extension?(version_data)
+    File.extname(version_data['filename']) == '.jar'
   end
+
 end

data/lib/bukin/providers/bukkit_dl.rb

@@ -14,17 +14,21 @@ class Bukin::BukkitDl
     "#{url}/api/1.0/downloads"
   end
 
-  def download_url
-    url
-  end
+  def resolve_info(data)
+    if data[:download]
+      data[:display_version] = data[:version]
+      return data
+    end
 
-  def download(name, version)
-    url = download_url + info(name, version)['file']['url']
-    download_file(url)
-  end
+    name = data[:name]
+    version = data[:version] || 'latest-rb'
 
-  def info(name, version)
     url = "#{api_url}/projects/#{name}/view/#{version}/"
-    JSON.parse(open(url).read)
+    info = JSON.parse(open(url).read)
+
+    data[:version] = "build-#{info['build_number']}"
+    data[:display_version] = info['version']
+    data[:download] = @url + info['file']['url']
+    data
   end
 end

data/lib/bukin/utils.rb

@@ -9,7 +9,7 @@ end
 
 def download_file(url, content_disposition = false)
   open(url) do |download|
-    file_name = if content_disposition
+    file_name = if download.meta['content-disposition']
                   download.meta['content-disposition']
                           .match(/filename=(\"?)(.+)\1/)[2]
                           .force_encoding("UTF-8")

data/lib/bukin/version.rb

@@ -1,3 +1,3 @@
 module Bukin
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bukin
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-19 00:00:00.000000000 Z
+date: 2013-04-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -61,6 +61,7 @@ files:
 - lib/bukin.rb
 - lib/bukin/bukfile.rb
 - lib/bukin/cli.rb
+- lib/bukin/exceptions.rb
 - lib/bukin/friendly_errors.rb
 - lib/bukin/installer.rb
 - lib/bukin/lockfile.rb