bukkit 1.1.1 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1abf5468b2746310d6754a4a69fc7081762bfe4a
-  data.tar.gz: ce882671e640baa4cd3bfe083ebc77b17c38467a
+  metadata.gz: f1b629fd2236d5b00287b416a0ef102b447176db
+  data.tar.gz: da6b41be2fb9f960e801bc9544cbe0642ab10427
 SHA512:
-  metadata.gz: 42ac84c2efc316fef4361ad46200478e3a98f0609835f5cd43377385c2e6211190b126875bfe53b8039ff97d63c87d2a2e75bab2507f33eb5e844337392e1f9a
-  data.tar.gz: 0a610454dfab3267ffb43efbc4a066dda0771e77e892941b09ab8897326a554a2843b0b67345f840eb17c1a3e909e452676ec44c6263bc6eb7f0f20e1a2fd60f
+  metadata.gz: c982ff1f02457fe724335a3ef186264bdfe6145bb149d12352ccac98429dddaf2ce8fe7102465ea172280f33369ec95a7e552d6e1a99c8c18376cc968f8e0aef
+  data.tar.gz: f21745c682369af6d43389054bcfcdd563e0e6b8eda67621987524b2f11d25a8afc62487492955a8d999ca7d94a71d2484cc1d4bf2162c6f102ccc91316abd37

data/.gitignore

@@ -1,4 +1,6 @@
 .DS_Store
+*.swp
+*~
 *.gem
 gem/
-test/
+my-awesome-server/

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 1.9.3
-  - 1.8.7
+  - 1.9.3

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    bukkit (1.1.0)
+    bukkit (2.0.0)
       archive-zip
       colorize
       commander
-      json
+      curb
       launchy
+      multi_json
 
 GEM
   remote: https://rubygems.org/
@@ -17,11 +18,12 @@ GEM
     colorize (0.6.0)
     commander (4.1.5)
       highline (~> 1.6.11)
+    curb (0.8.5)
     highline (1.6.20)
     io-like (0.3.0)
-    json (1.8.1)
-    launchy (2.3.0)
+    launchy (2.4.2)
       addressable (~> 2.3)
+    multi_json (1.8.2)
     rake (10.1.0)
 
 PLATFORMS

data/LICENSE

@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -1,40 +1,52 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
-
-# Lib Files
-require 'bukkit/version'
+# Created by Jesse Herrick
+# www.jessegrant.net
+# jessegrantherrick@gmail.com
 
 # Gems
 require "rubygems"
 require "rake"
 require "colorize"
+require "rake/testtask"
 
-# Tasks
-desc "Get version"
-task :version do
-	version = Bukkit::VERSION_FULL.split
-	puts "#{version[0].blue} #{version[1].yellow}"
+# Helpers
+def test(filename)
+    puts `ruby -I . test/test_#{filename}.rb`
 end
 
+# Tasks
 desc "Default task."
 task :default do
-	`rake version`
-	puts "Nothing to see here... move along.".green
-	puts "Run".yellow + " `bukkit new my-awesome-server-name` to start a new server."
+    puts `rake test`
+    puts "Gem seems to be in tip top shape!".green
+    puts "Run: ".yellow + "`bukkit --help` to list all commands."
+end
+
+# Run all tests.
+Rake::TestTask.new do |t|
+    t.libs << "test"
+    t.libs << "bin"
+    t.test_files = FileList['test/test*.rb']
+    t.verbose = true
 end
 
 desc "Build gem."
 task :build do
-	puts "Starting gem build...".yellow
-	puts "          Building...".yellow
-	`gem build bukkit.gemspec`
+    puts "Starting gem build...".yellow
+    puts "          Building...".yellow
+    `gem build bukkit.gemspec`
 
-	version = Bukkit::VERSION
-	puts "Bukkit-CLI successfully built! ".green + "Gem ".blue + "v" + version
+    puts "bukkit successfully built!".green
+    puts "Gems in this directory: ".yellow
+    Dir.glob("*.gem").each { |gem| puts "=> " + gem.yellow }
+end
 
-	gem = Dir.glob("*.gem")[0]
-	Dir.mkdir("gem") unless Dir.exists?("gem")
-	FileUtils.mv(gem, "gem/")
-	puts " Gem: ".red + "#{Dir.getwd}/gem/" + gem.yellow
+desc "Install the gem."
+task :install do
+    gem = Dir.glob("*.gem").last
+    puts "Installing gem...".yellow
+    puts "From: ".yellow + gem
+    `gem install #{gem}`
+    puts "Gem successfully installed!".green
 end

data/bin/bukkit

@@ -18,134 +18,146 @@ command :new do |c|
 	c.option "--rb", "Create a new server with the recommended build."
 	c.option "--beta", "Create a new server with the beta build."
 	c.option "--dev", "Create a new server with the dev build."
-  c.option "-f", "--force", "Overwrites the chosen directory if it already exists."
-	# TODO: Those are bools, pass the t/f values to a case statement then pass that to Bukkit::new
+	c.option "-f", "--force", "Overwrites the chosen directory if it already exists."
+
 	c.action do |args, options|
-    # Make 'dir' = to first arg
-    dir = args.shift
-
-		if options.rb == true
-			build = "rb"
-		elsif options.beta == true
-			build = "beta"
-		elsif options.dev == true
-			build = "dev"
+		rb = options.rb
+		beta = options.beta
+		dev = options.dev
+		force = options.force
+
+		name = args.shift
+
+		new_options = Hash.new
+
+		# If it doesn't have a name then just stop them right there.
+		abort "You didn't enter a server name.\nTry `bukkit new my-awesome-server-name`." if name.nil?
+
+		# Add the build to the new_options hash.
+		if rb
+			new_options.merge!(:build => :rb)
+		elsif beta
+			new_options.merge!(:build => :beta)
+		elsif dev
+			new_options.merge!(:build => :dev)
 		else
-			build = ask "What build would you like? (rb/beta/dev) "
-			case build.downcase
-			when "rb", "recommended", "r"
-				build = "rb"
-			when "beta", "b"
-				build = "beta"
-			when "dev", "d", "developer"
-				build = "dev"
+			# If the user didn't give a build option then ask for it.
+			build = ask "Build [rb/beta/dev]: "
+			case build
+			when "rb", "recommended"
+				new_options.merge!(:build => :rb)
+			when "beta"
+				new_options.merge!(:build => :beta)
+			when "dev", "development"
+				new_options.merge!(:build => :dev)
 			else
-				abort "ERROR: Invalid option '#{build}'\nTry `bukkit new --help`"
+				abort "Invalid build option.".red
 			end
 		end
 
-    if options.force == true
-      force = true
-    else
-      force = nil
-    end
-
-    begin
-		  Bukkit::new(build, dir, force)
-    rescue TypeError
-      abort "ERROR: Server name not specified.\nTry `bukkit new my-awesome-server-name`"
-    end
+		# Add the force option if it's needed. Adds the bool returned from 'force'.
+		force = false if force.nil?
+		new_options.merge!(:force => force)
+
+		# Now finally send the options to the method.
+		server = Bukkit::Server.new(name)
+		server.create(new_options)
+		server.start
 	end
 end
+alias_command :create, :new
 
-command :start do |c|
-  c.syntax = "bukkit start"
-  c.summary = "Start your server."
-  c.description = "Start the bukkit server. (Must be in server's root)"
-  c.example "Start your server.", "bukkit start"
-  c.action do |args, options|
-    puts "Starting the server...".green
-    Bukkit::start
-  end
+command :update do |c|
+	c.syntax = "bukkit update [options]"
+	c.summary = "Download the latest CraftBukkit version."
+	c.description = "Download the latest CraftBukkit version from dl.bukkit.org."
+	c.example c.summary, "bukkit update"
+	c.option "--rb", "Update server with the recommended build."
+	c.option "--beta", "Update server with the beta build."
+	c.option "--dev", "Update server with the dev build."
+
+	c.action do |args, options|
+		rb = options.rb
+		beta = options.beta
+		dev = options.dev
+		force = options.force
+
+		update_options = Hash.new
+
+		# Add the build to the new_options hash.
+		if rb
+			update_options.merge!(:build => :rb)
+		elsif beta
+			update_options.merge!(:build => :beta)
+		elsif dev
+			update_options.merge!(:build => :dev)
+		else
+			# If the user didn't give a build option then ask for it.
+			build = ask "Build [rb/beta/dev]: "
+			case build
+			when "rb", "recommended"
+				update_options.merge!(:build => :rb)
+			when "beta"
+				update_options.merge!(:build => :beta)
+			when "dev", "development"
+				update_options.merge!(:build => :dev)
+			else
+				puts "Invalid build option."
+			end
+		end
+		# Now finally send the options to the method.
+		Bukkit::Server.update(update_options)
+	end
 end
 
-command :install do |c|
-  c.syntax = "bukkit install my-favorite-plugin [options]"
-  c.summary = "Install a new bukkit plugin."
-  c.description = "Installs a new bukkit plugin. Must be on dev.bukkit.org. (can also be a zip!)"
-
-  c.example "Installs the plugin 'my-favorite-plugin' (will ask for website when done).", "bukkit install my-favorite-plugin"
-
-  c.example "Installs the plugin 'my-favorite-plugin' and doesn't ask to open it's website", "bukkit install my-favorite-plugin --nowebsite"
-  c.option "--nowebsite", "Doesn't ask for website after install."
-  
-  c.action do |args, options|
-    if args.empty?
-      abort "ERROR: ".red + "You didn't enter an argument."
-    else
-      if options.nowebsite == true
-        Bukkit::Install.normal(args.shift.downcase, true)
-      else
-        Bukkit::Install.normal(args.shift.downcase)
-      end
-    end
-  end
+command :start do |c|
+	c.syntax = "bukkit start"
+	c.summary = "Open the plugin's start in the default browser."
+	c.description = c.summary
+	c.example c.summary, "bukkit website plugin-name"
+	c.example "Show just the plugin's URL.", "bukkit website plugin-name --url"
+	c.option "--url", "Show just the plugin's URL."
+
+	c.action do |args, options|
+		Bukkit::Server.start
+	end
 end
 
 command :website do |c|
-  c.syntax = "bukkit website my-favorite-plugin"
-  c.summary = "Open a plugin's website."
-  c.description = "Opens a plugin's website your default browser."
-  c.example "Open a plugin's website.", "bukkit website my-favorite-plugin"
-  c.option "-u", "--url", "Only show the url."
-  c.action do |args, options|
-    if args.empty?
-      abort "ERROR: ".red + "You didn't enter an argument."
-    else
-      plugin = args.shift.downcase
-      if options.url == true
-        Bukkit.url(plugin)
-      else
-        Bukkit.website(plugin)
-      end
-    end
-  end
+	c.syntax = "bukkit website [options]"
+	c.summary = "Open the plugin's website in the default browser."
+	c.description = c.summary
+	c.example c.summary, "bukkit website plugin-name"
+	c.example "Show just the plugin's URL.", "bukkit website plugin-name --url"
+	c.option "--url", "Show just the plugin's URL."
+
+	c.action do |args, options|
+		abort "You didn't enter a plugin name." if args.shift.nil?
+
+		plugin = Bukkit::Plugin.new(args.shift)
+
+		if options.url
+			puts "    Website: ".yellow + plugin.website
+		else
+			plugin.view_website
+		end
+	end
 end
 
-command :update do |c|
-  c.syntax = "bukkit update [options]"
-  c.summary = "Get the latest version of bukkit."
-  c.description = "Download the latest version of CraftBukkit."
-  c.example "Updates your server to the latest recommended build.", "bukkit update --rb"
-  c.option "--rb", "Get the latest recommended build."
-  c.option "--beta", "Get the latest beta build."
-  c.option "--dev", "Get the latest dev build."
-  # TODO: Those are bools, pass the t/f values to a case statement then pass that to Bukkit::new
-  c.action do |args, options|
-    if options.rb == true
-      build = "rb"
-    elsif options.beta == true
-      build = "beta"
-    elsif options.dev == true
-      build = "dev"
-    else
-      build = ask "What build would you like? (rb/beta/dev) "
-      case build.downcase
-      when "rb", "recommended", "r"
-        build = "rb"
-      when "beta", "b"
-        build = "beta"
-      when "dev", "d", "developer"
-        build = "dev"
-      else
-        abort "ERROR:".red + " Invalid option '#{build}'\nTry `bukkit new --help`"
-      end
-    end
-    # Send args & opts to Bukkit::update
-    begin
-      Bukkit::update(build)
-    rescue
-      abort "ERROR:".red + " Something bad happened!.\nTry `bukkit new --help`\n  If error persists create an issue with specific details here:\n        https://github.com/JesseHerrick/bukkit/issues/new"
-    end
-  end
+command :install do |c|
+	c.syntax = "bukkit install my-favorite-plugin"
+	c.summary = "Install a plugin to your server."
+	c.description = c.summary
+	c.example c.summary, "bukkit install my-favorite-plugin"
+
+	c.action do |args, options|
+		name = args.shift
+
+		if name.empty?
+			abort "You didn't enter a plugin name."
+		else
+			plugin = Bukkit::Plugin.new(name)
+			plugin.install
+		end
+	end
 end

data/bukkit.gemspec

@@ -1,31 +1,31 @@
-# coding: utf-8
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'bukkit/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "bukkit"
-  spec.version       = Bukkit::VERSION
-  spec.authors       = ["Jesse Herrick"]
-  spec.email         = ["school@jessegrant.net"]
-  spec.description   = %q{A command line wrapper for CraftBukkit.}
-  spec.summary       = %q{A command line wrapper for CraftBukkit. Manage your server much easier.}
-  spec.homepage      = "https://github.com/JesseHerrick/Bukkit-CLI"
-  spec.license       = "MIT"
+	spec.name          = "bukkit"
+	spec.version       = Bukkit::VERSION
+	spec.authors       = ["Jesse Herrick"]
+	spec.email         = ["school@jessegrant.net"]
+	spec.description   = %q{A command line wrapper for CraftBukkit.}
+	spec.summary       = %q{A command line wrapper for CraftBukkit. Manage your server much easier.}
+	spec.homepage      = "https://github.com/JesseHerrick/Bukkit-CLI"
+	spec.license       = "MIT"
 
-  spec.files         = `git ls-files`.split($/)
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
-  spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+	spec.files         = `git ls-files`.split($/)
+	spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+	spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
+	spec.require_paths = ["lib"]
 
-  # Runtime Dependencies
-  spec.add_runtime_dependency('archive-zip')
-  spec.add_runtime_dependency('colorize')
-  spec.add_runtime_dependency('commander')
-  spec.add_runtime_dependency('json')
-  spec.add_runtime_dependency('launchy')
+	# Runtime Dependencies
+	spec.add_runtime_dependency('archive-zip')
+	spec.add_runtime_dependency('colorize')
+	spec.add_runtime_dependency('commander')
+	spec.add_runtime_dependency('multi_json')
+	spec.add_runtime_dependency('launchy')
+	spec.add_runtime_dependency('curb')
 
-  # Dev Dependencies
-  spec.add_development_dependency('bundler')
-  spec.add_development_dependency('rake')
+	# Dev Dependencies
+	spec.add_development_dependency('bundler')
+	spec.add_development_dependency('rake')
 end

data/lib/bukkit.rb

@@ -1,11 +1,28 @@
 # Orderly and Alphabetical Require Statements
 require 'rubygems'
+require 'colorize'
+require 'open-uri'
+require 'json'
 
-require 'bukkit/check'
+require 'bukkit/create'
 require 'bukkit/download'
 require 'bukkit/install'
-require 'bukkit/new'
 require 'bukkit/start'
 require 'bukkit/update'
 require 'bukkit/version'
-require 'bukkit/website'
+require 'bukkit/website'
+
+module Bukkit
+	class Server
+		def initialize(name)
+			@name = name
+		end
+	end
+
+	class Plugin
+		def initialize(name)
+			@name = name.downcase
+			@plugin_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{@name}").read)
+		end 
+	end
+end

data/lib/bukkit/create.rb

@@ -0,0 +1,30 @@
+module Bukkit
+	class Server
+		# Create a new server.
+		def create(options = {}) # Options: { :build => :rb/:beta/:dev, :force => false/true }
+			force = options[:force]
+
+			# If the dir already exists, fail gracefully.
+			if Dir.exists?(@name)
+				puts "'#{@name}' already exists.".red
+
+				names = %w{ minecraftyness mine-opolis mineville minetown bukkits-o-fun }
+				abort "Try ".yellow + "`bukkit new #{names.sample}` ".light_yellow + "or".yellow + " `bukkit new #{@name} --force`".light_blue
+			end
+
+			# Let the dark side of the force flow through you...
+			if force == true
+				puts "Overwriting: ".light_red + "#{@name}/"
+				FileUtils.rm_rf(@name)
+			end
+
+			# Create the server directory and cd into it.
+			Dir.mkdir(@name)
+			puts "     Create: ".green + "#{@name}/"
+			Dir.chdir(@name)
+
+			# Download build.
+			Bukkit::Server.download("http://dl.bukkit.org/latest-#{options[:build].to_s}/craftbukkit.jar")
+		end
+	end
+end

data/lib/bukkit/download.rb

@@ -1,13 +1,32 @@
-require 'open-uri'
+require 'curb'
 
 module Bukkit
-	def self.download(filename, uri)
-		begin
-			File.open("#{filename}", "wb") do |file|
-				file.write open("#{uri}").read
+	class Server
+		# Download a file from a URI.
+		def self.download(uri, options = {}) # Options: { :filename => "filename.ext" }
+			# Get the filename. If it isn't defined, derive it from the URI.
+			if options[:filename]
+				filename = options[:filename]
+			else
+				filename = uri.split("\/").last
 			end
-		rescue Errno::ENOENT
-			abort "ERROR: No internet connection."
+
+			# Give some friendly output.
+			puts "Downloading: ".yellow + filename
+			puts "       From: ".yellow + uri
+
+			# Download the file.
+			data = Curl::Easy.perform(uri)
+			data.follow_location = true
+			data.max_redirects = 8
+			data.useragent = "curb"
+			data.perform
+			File.open(filename, "wb") do |file|
+				file.write(data.body_str)
+			end
+			# => filename.ext
+
+			puts filename.light_green + " successfully downloaded!".green
 		end
 	end
 end

data/lib/bukkit/install.rb

@@ -1,74 +1,49 @@
 require 'open-uri'
 require 'json'
 require 'archive/zip'
-require 'launchy'
-require 'colorize'
 
 module Bukkit
-	class Install
-		def self.normal(plugin, nowebsite = false)
-			# Check if in root
-			abort "ERROR:".red + " Not in server's root directory.\nTry `bukkit new my-awesome-server-name`.".yellow if Bukkit::Check.root? == false
+	class Plugin
+		# Install a new plugin.
+		def install
+			# Get server's download link.
+			@download_url = @plugin_api["versions"][0]["download"]
+			@filename = @plugin_api["versions"][0]["filename"]
 
-			# BukGet API for Plugin Installs
-			plugins_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{plugin}").read)
-			# Get Plugin's Website
-			@@website = plugins_api["website"]
-			# Get Plugin's Download Link
-			download = plugins_api["versions"][0]["download"]
-			# Get Plugin's Filename
-			filename = plugins_api["versions"][0]["filename"]
-			# Switch to plugins dir
-			plugin = plugin.downcase
+			# Fail... gracefully, if craftbukkit.jar does not exist.
+			abort "You're not in a server's root directory!".red unless File.exists? "craftbukkit.jar"
+
+			# Go into plugins and download the plugin.
 			Dir.chdir("plugins")
-			puts "Downloading #{plugin} from #{@@website}..."
-			# Download File from dev.bukkit.org
-			Bukkit::download(filename, download)
+			Bukkit::Server.download(@download_url, :filename => @filename)
 
-			file_ext = File.extname(filename)
+			file_ext = File.extname(@filename)
 
 			# Unzip if it's a zip
 			case file_ext
 			when ".zip"
 				# Extract Zip Archive
-				Archive::Zip.extract(filename, plugin) 
-				Dir.chdir(plugin)
+				Archive::Zip.extract(@filename, @name)
+				Dir.chdir(@name)
 				jarfiles = Dir.glob("*.jar")
 				# Move each jar file outside the folder.
 				jarfiles.each do |jar|
 					FileUtils.mv(jar, "../")
 				end
+				puts " Unarchived: ".yellow + @filename
+
 				Dir.chdir("../")
 				# Delete the extracted folder.
-				FileUtils.rm_r("#{plugin}/", :force => true)
+				FileUtils.rm_rf("#{@name}/")
 				# Delete the archive.
-				FileUtils.rm_r("filename", :force => true)
-
-				puts "#{plugin.capitalize!} successfully installed!"
-
-				if nowebsite == false
-					website?
-				end
-			# If it's a jar... continue.
+				FileUtils.rm_rf(@filename)
 			when ".jar"
-				if nowebsite == true
-					abort
-				else
-					website?
-				end
-			# If it's anything else...
+				nil
 			else
-				say "ERROR: ".red + "#{file_ext} is not supported at this time."
-			end
-		end
-
-		def self.website?
-			website_yn = agree "Would you like to visit it's website? (yes/no)"
-
-			if website_yn == true
-				puts "Launching website!"
-				Launchy.open(@@website)
+				abort "Something weird happened...\nThe file extension is #{file_ext}, not '.zip' or '.jar'."
 			end
+			puts "  Installed: ".light_green + @name
+			puts @name.light_green + " successfully installed!".green
 		end
 	end
 end

data/lib/bukkit/start.rb

@@ -1,6 +1,9 @@
 module Bukkit
-	def self.start
-		abort "ERROR:".red + " You aren't in your server's root directory." if Bukkit::Check.root? == false
-		system 'java -jar craftbukkit.jar'
+	class Server
+		# Start the server.
+		def start
+			puts "Starting your CraftBukkit server.".green
+			system 'java -jar craftbukkit.jar'
+		end
 	end
 end

data/lib/bukkit/update.rb

@@ -1,19 +1,13 @@
 module Bukkit
-	def self.update(build)
-		# Get build url.
-		case build
-		when "rb"
-			# Download the Latest Recommended Build
-			say "Downloading Recommended Build... (this may take a while)"
-			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit.jar")
-		when "beta"
-			# Download the Latest Beta Build
-			say "Downloading Beta Build... (this may take a while)"
-			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-beta.jar")
-		when "dev"
-			# Download the Latest Developer Build
-			say "Downloading Developer Build... (this may take a while)"
-			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-dev.jar")
+	class Server
+		# Download a new version of bukkit.
+		def self.update(options = { :build => :rb }) # Options: { :build => :rb/:beta/:dev }
+			Bukkit::Server.download("http://dl.bukkit.org/latest-#{options[:build].to_s}/craftbukkit.jar")
+		end
+
+		# Download a new version of bukkit.
+		def update(options = { :build => :rb }) # Options: { :build => :rb/:beta/:dev }
+			Bukkit::Server.download("http://dl.bukkit.org/latest-#{options[:build].to_s}/craftbukkit.jar")
 		end
 	end
 end

data/lib/bukkit/version.rb

@@ -1,4 +1,4 @@
 module Bukkit
-	VERSION = "1.1.1"
+	VERSION = "2.0.0"
 	VERSION_FULL = "Bukkit-CLI v#{VERSION}"
-end
+end

data/lib/bukkit/website.rb

@@ -1,27 +1,20 @@
-require 'open-uri'
-require 'json'
 require 'launchy'
 
 module Bukkit
-   def self.website(plugin)
-        begin
-    	    plugins_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{plugin}").read)
-    	    website = plugins_api["website"]
-            Launchy.open(website)
-            sleep(1)
-    	    puts "Opening the plugin's website in your default browser..."
-    	rescue OpenURI::HTTPError
-    	    puts "ERROR: Plugin not found.\nMake sure you have the name correct.\nTry `bukkit website --help`"
-    	    Bukkit::Help.website
-    	rescue
-    	    puts "ERROR: Plugin name is undefined."
-	   end
-    end
+    class Plugin
+        # Return the plugin's website URL.
+        def website
+            @website = @plugin_api["website"]
+        end
+        # => http://dev.bukkit.org/bukkit-plugins/pluginname
 
-    def self.url(plugin)
-        plugins_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{plugin}").read)
-        website = plugins_api["website"]
-        say "\n#{plugin}'s website URL is #{website}."
-        puts ""
+        # Open website in default browser.
+        def view_website
+            Launchy.open(website)
+            puts "Opening #{@name}'s Website...".light_green
+            puts "    Website: ".yellow + website
+            sleep 1.5
+            return website
+        end
     end
 end

data/test/test_create.rb

@@ -0,0 +1,20 @@
+require 'test/unit'
+require 'bukkit'
+
+class TestCreate < Test::Unit::TestCase
+	def test_create_rb
+		server = Bukkit::Server.new("my-awesome-server")
+		options = { :build => :rb, :force => true }
+		server.create(options)
+
+		def check_for_server
+			Dir.chdir("my-awesome-server/") if Dir.exists?("my-awesome-server")
+			true if File.exists?("craftbukkit.jar")
+		end
+
+		assert_equal(check_for_server, true)
+		
+		Dir.pwd.red
+		Dir.chdir("../")
+	end
+end

data/test/test_download.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+require 'bukkit'
+
+class TestDownload < Test::Unit::TestCase
+	def test_download
+		Bukkit::Server.download("http://www.jessegrant.net/humans.txt")
+		assert_equal(true, File.exists?("humans.txt"))
+		FileUtils.rm("humans.txt")
+	end
+end

data/test/test_install.rb

@@ -0,0 +1,22 @@
+require 'test/unit'
+require 'bukkit'
+
+class TestInstall < Test::Unit::TestCase
+	def test_install
+		plugin = Bukkit::Plugin.new("WorldEdit")
+		
+		# Go into server's dir.
+		Dir.chdir("my-awesome-server")
+		# Create plugins dir because it isn't generated by tests.
+		Dir.mkdir("plugins") unless Dir.exists?("plugins")
+		plugin.install
+
+		expected = File.exists?("WorldEdit.jar")
+		assert_equal(expected, true)
+		Dir.chdir("../")
+
+		# Then delete it again and cd back out.
+		FileUtils.rm_rf("plugins")
+		Dir.chdir("../")
+	end
+end

data/test/test_update.rb

@@ -0,0 +1,11 @@
+require 'test/unit'
+require 'bukkit'
+
+class TestUpdate < Test::Unit::TestCase
+	def test_update_rb
+		Bukkit::Server.update(:build => :rb)
+		expected = File.exists?("craftbukkit.jar")
+		assert_equal(expected, true)
+		# FileUtils.rm("craftbukkit.jar")
+	end
+end

data/test/test_website.rb

@@ -0,0 +1,10 @@
+require 'test/unit'
+require 'bukkit'
+
+class TestWebsite < Test::Unit::TestCase
+	def test_website
+		plugin = Bukkit::Plugin.new("WorldEdit")
+		expected = plugin.website
+		assert_equal(expected, "http://dev.bukkit.org/bukkit-plugins/worldedit")
+	end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bukkit
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Jesse Herrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-17 00:00:00.000000000 Z
+date: 2013-12-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: curb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -128,14 +142,18 @@ files:
 - bin/bukkit
 - bukkit.gemspec
 - lib/bukkit.rb
-- lib/bukkit/check.rb
+- lib/bukkit/create.rb
 - lib/bukkit/download.rb
 - lib/bukkit/install.rb
-- lib/bukkit/new.rb
 - lib/bukkit/start.rb
 - lib/bukkit/update.rb
 - lib/bukkit/version.rb
 - lib/bukkit/website.rb
+- test/test_create.rb
+- test/test_download.rb
+- test/test_install.rb
+- test/test_update.rb
+- test/test_website.rb
 homepage: https://github.com/JesseHerrick/Bukkit-CLI
 licenses:
 - MIT
@@ -156,9 +174,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: A command line wrapper for CraftBukkit. Manage your server much easier.
-test_files: []
-has_rdoc: 
+test_files:
+- test/test_create.rb
+- test/test_download.rb
+- test/test_install.rb
+- test/test_update.rb
+- test/test_website.rb

data/lib/bukkit/check.rb

@@ -1,11 +0,0 @@
-module Bukkit
-	class Check
-		def self.root?
-			if File.exists? "craftbukkit.jar"
-				true
-			else
-				false
-			end
-		end
-	end
-end

data/lib/bukkit/new.rb

@@ -1,39 +0,0 @@
-module Bukkit
-	# N2K: http://cbukk.it/craftbukkit.jar http://cbukk.it/craftbukkit-beta.jar http://cbukk.it/craftbukkit-dev.jar
-	def self.new(build, dir, force = false)
-		# Create a Folder for the Server
-		if Dir.exists?(dir)
-			# Error unless forced dir overwrite.
-			abort "ERROR:".red + " Directory already exists. Try a different name." unless force == true
-
-			# If it didn't abort, overwrite the dir because it was forced.
-			FileUtils.rm_r("#{dir}/")
-			Dir.mkdir(dir)
-			Dir.chdir(dir)
-		else
-			Dir.mkdir(dir)
-			Dir.chdir(dir)
-		end
-
-		case build
-		when "rb"
-			# Download Recommended Build
-			say "Downloading Recommended Build... (this may take a while)"
-			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit.jar")
-		when "beta"
-			# Download Beta Build
-			say "Downloading Beta Build... (this may take a while)"
-			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-beta.jar")
-		when "dev"
-			# Download Developer Build
-			say "Downloading Developer Build... (this may take a while)"
-			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-dev.jar")
-		end
-
-		puts "Server built!".green
-		puts "Dir: ".yellow + Dir.getwd
-
-		# Start the Server
-		Bukkit.start
-	end
-end