bukkit 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43020b11a085c9062414564e65108400652766df
-  data.tar.gz: 5423f8b69408cedd9527b41ed9220ca93bb006c9
+  metadata.gz: d1c0d091e909b740313bf63c077f5fb8ea7d228f
+  data.tar.gz: 7361c6d1b921b2146f92763b782c3936fb00918d
 SHA512:
-  metadata.gz: 44731d231f55497df9b9a5a63b1a0a12c4671bb318cc8c5e83aaf4a159cc520837fbee37d595f9b477a6d1c5888b51a664b57bd52204da812f138aff60e215ac
-  data.tar.gz: 025638668b9d1bed24d38a3f1572577e7f2320199599fd675e9e4fbcbaa82474f6b152dbe3ae086f19d555230c600eeb83ad920c9d2d0082a9712d3ce9ff2712
+  metadata.gz: 9c56a1ad659f9b9f6380513e9942c89567b158d894b3745c8e43d1bb9d76cdac45c4e3f9886793d440009525b45bdbebd5acdc93d8947717744f5b3198f50124
+  data.tar.gz: c81b916b646b867e7ac6d3a186a5a6525c0a2b42d6967e1e50ccd9f7f02f374379496467ea0441c2c07a1ef76775bdf2f1a4cfd95a23747356affecb66fbbc2c

data/.gitignore

@@ -1,3 +1,4 @@
 .DS_Store
 *.gem
+gem/
 test/

data/CHANGELOG

@@ -0,0 +1,2 @@
+v0.1.0: Added 'update' command and a few bug fixes.
+v0.1.1: Major bug fix.

data/bukkit.gemspec

@@ -21,4 +21,4 @@ Gem::Specification.new do |spec|
   spec.add_dependency('json')
   spec.add_dependency('archive-zip')
   spec.add_dependency('launchy')
-end
+end

data/lib/bukkit.rb

@@ -1,10 +1,12 @@
 # Orderly and Alphabetical requires h, i, n, s, v
 require 'rubygems'
 
+require 'bukkit/download'
 require 'bukkit/help'
 require 'bukkit/install'
 require 'bukkit/new'
 require 'bukkit/start'
+require 'bukkit/update'
 require 'bukkit/version'
 require 'bukkit/website'
 
@@ -25,6 +27,8 @@ module Bukkit
 		Bukkit::install
 	when "website"
 		Bukkit::website
+	when "update"
+		Bukkit::update
 	else
 		if opt1.nil?
 			puts "You didn't enter a command.\n"

data/lib/bukkit/download.rb

@@ -0,0 +1,9 @@
+require 'open-uri'
+
+module Bukkit
+	def self.download(filename, uri)
+		File.open("#{filename}", "wb") do |file|
+			file.write open("#{uri}").read
+		end
+	end
+end

data/lib/bukkit/help.rb

@@ -13,6 +13,9 @@ module Bukkit
 		puts "    Open a plugin's website:"
 		puts "      bukkit website PLUGIN_NAME"
 		puts "\n"
+		puts "    Update your version of CraftBukkit:"
+		puts "      bukkit update"
+		puts "\n"
 		# Put Last
 		puts "    Show this page:"
 		puts "      bukkit --help OR bukkit -h"

data/lib/bukkit/install.rb

@@ -5,20 +5,20 @@ require 'launchy'
 
 module Bukkit
 	def self.install
-		opt2 = ARGV[1].downcase
-		abort("USAGE: bukkit install PLUGIN_NAME") if opt2.nil?
+		$opt2 = ARGV[1].downcase
+		abort("USAGE: bukkit install PLUGIN_NAME") if $opt2.nil?
 		begin
-			plugins_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{opt2}").read)
-			$website = plugins_api["website"]
+			plugins_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{$opt2}").read)
+			website = plugins_api["website"]
 			download = plugins_api["versions"][0]["download"]
 			filename = plugins_api["versions"][0]["filename"]
 			Dir.chdir("plugins")
-			puts "Website: #{$website}"
-			%x(curl -L #{download} > #{filename})
+			puts "Downloading #{$opt2} from #{website}..."
+			Bukkit::download(filename, download)
 			if File.extname(filename) == ".zip"
 				# Extract Zip Archive
-				Archive::Zip.extract(filename, opt2) 
-				Dir.chdir(opt2)
+				Archive::Zip.extract(filename, $opt2) 
+				Dir.chdir($opt2)
 				jarfiles = Dir.glob("*.jar")
 				# Move each jar file outside the folder.
 				jarfiles.each do |jar|
@@ -26,7 +26,7 @@ module Bukkit
 				end
 				Dir.chdir("../")
 				# Delete the extracted folder.
-				%x(rm -rf #{opt2}/)
+				%x(rm -rf #{$opt2}/)
 				# Delete the archive.
 				%x(rm #{filename})
 				puts "Plugin successfully installed!"
@@ -44,9 +44,9 @@ module Bukkit
 end
 
 def ask_website
-	if ARGV.include? "--nowebsite"
-		abort
-	else
-		Bukkit::website
+	if ARGV.include? "--website"
+		Bukkit.website($opt2)
+	elsif ARGV.include? "-w"
+		Bukkit.website($opt2)
 	end
 end

data/lib/bukkit/new.rb

@@ -7,18 +7,18 @@ module Bukkit
 
 		case q1
 		when "rb", "recommended", "r"
-			puts "Downloading CraftBukkit Recommended build...\n"
-			%x(curl -L http://cbukk.it/craftbukkit.jar > craftbukkit.jar)
+			puts "Downloading CraftBukkit Recommended build... (this could take a minute)\n"
+			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit.jar")
 			puts "\nSuccessfully downloaded Recommended build."
 			Bukkit::start
 		when "beta", "b"
-			puts "Downloading CraftBukkit Beta build...\n"
-			%x(curl -L http://cbukk.it/craftbukkit-beta.jar > craftbukkit.jar)
+			puts "Downloading CraftBukkit Beta build... (this could take a minute)\n"
+			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-beta.jar")
 			puts "\nSuccessfully downloaded Beta build."
 			Bukkit::start
 		when "dev", "development", "d"
-			puts "Downloading CraftBukkit Development build...\n"
-			%x(curl -L http://cbukk.it/craftbukkit-dev.jar > craftbukkit.jar)
+			puts "Downloading CraftBukkit Development build... (this could take a minute)\n"
+			Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-dev.jar")
 			puts "\nSuccessfully downloaded Development build."
 			Bukkit::start
 		else

data/lib/bukkit/update.rb

@@ -0,0 +1,32 @@
+module Bukkit
+	def self.update
+		begin
+			puts "  Do want the recommended build, beta build, or dev build?"
+			print "  rb, beta, dev? "
+			q1 = $stdin.gets.chomp
+
+			case q1
+			when "rb", "recommended", "r"
+				puts "Downloading CraftBukkit Recommended build... (this could take a minute)\n"
+				Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit.jar")
+				puts "\nSuccessfully updated."
+			when "beta", "b"
+				puts "Downloading CraftBukkit Beta build... (this could take a minute)\n"
+				Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-beta.jar")
+				puts "\nSuccessfully updated."
+			when "dev", "development", "d"
+				puts "Downloading CraftBukkit Development build... (this could take a minute)\n"
+				Bukkit::download("craftbukkit.jar", "http://cbukk.it/craftbukkit-dev.jar")
+				puts "\nSuccessfully updated."
+			else
+				if q1.length > 0
+					abort("  \"#{q1}\" is not an option.")
+				else
+					abort("  You didn't enter an option.")
+				end
+			end
+		rescue
+			puts "Uh oh! Something failed. Please report what you were doing at the time of this bug, and any other info you have at: https://github.com/JesseHerrick/bukkit/issues/new"
+		end
+	end
+end

data/lib/bukkit/version.rb

@@ -1,3 +1,4 @@
+# TODO update command
 module Bukkit
-	VERSION = "0.0.9"
-end
+	VERSION = "0.1.1"
+end

data/lib/bukkit/website.rb

@@ -3,29 +3,14 @@ require 'json'
 require 'launchy'
 
 module Bukkit
-	def self.website
+	def self.website(plugin_name)
 		begin
-			$opt2 = ARGV[1].downcase
-			plugins_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{$opt2}").read)
-			$website = plugins_api["website"]
-			puts "  Opening #{$opt2}'s website in your default browser."
-			Launchy.open($website)
+			plugins_api = JSON.parse(open("http://api.bukget.org/3/plugins/bukkit/#{plugin_name}").read)
+			website = plugins_api["website"]
+			puts "Opening #{plugin_name}'s website in your default browser."
+			Launchy.open(website)
 		rescue OpenURI::HTTPError
 			puts "  Plugin not found.\n  Make sure you have the name correct."
 		end
 	end
-
-	def self.ask_website
-		print "Would you like to visit the plugin's website? (y/n) "
-		q2 = $stdin.gets.chomp
-		case q2
-		when "y", "yes"
-			puts "  Opening #{$opt2}'s website in your default browser."
-			Launchy.open($website)
-		when "n", "no"
-			abort("If you change your mind.\nRun the command 'bukkit website PLUGIN_NAME'.")
-		else
-			puts "'#{q2}' is not an option."
-		end
-	end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bukkit
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Jesse Herrick
@@ -61,15 +61,18 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- CHANGELOG
 - LICENSE
 - README.md
 - bin/bukkit
 - bukkit.gemspec
 - lib/bukkit.rb
+- lib/bukkit/download.rb
 - lib/bukkit/help.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
 homepage: https://github.com/JesseHerrick/bukkit