bukkit 2.4.2 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8392883d62a6c2662cec7e4a1c7608cd0bcc2142
-  data.tar.gz: 8ac7005c32031430547b6200e4d61e79d1890b2c
+  metadata.gz: 37f90dcf1aed8d821415a5e3792ea842e4f59414
+  data.tar.gz: 8a4e6856aea9312bcfc39d772d42e335634e73e6
 SHA512:
-  metadata.gz: db6b1eb3801d451f20112e70c381b5ecd5c11ebf4300305c65790d5bf012b79431c91c0ce80a220f2b2cc95058d509cde143448b796a154cc3443a9e1c0523f1
-  data.tar.gz: 66f15f6200d65a77636f11a3e34b5600026445814b32b45351f3b00dd58f82ee228f51d751677a78f2749dad1911adc6fa2c48513d59bc742557194c3c15ef52
+  metadata.gz: 6ede28aee1ed80ee7c31cee2740cc8880ad4522a1a5a283ffe3c70b6eeb73d9aa9b3582672d7115f7ecf1f1452dc88883269dea62c310d99e4fcab2ab4165e33
+  data.tar.gz: 52ffe9755c423038aa55defb72020266bcab8aacf65b0f635bfe62d74236d4d2454d65c37a1a8bd3e2a13f53ec5c1eaeb83a5cd9419f2c0b7f55685cdeae2795

data/.gitignore

@@ -3,6 +3,8 @@
 *~
 *.gem
 .bundle/
+tmp/
+pkg/
 gem/
 my-awesome-server/
 Gemfile.lock

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p353
+2.1.0

data/Guardfile

@@ -0,0 +1,5 @@
+guard 'cucumber' do
+  watch(%r{^features/.+\.feature$})
+  watch(%r{^features/support/.+$})          { 'features' }
+  watch(%r{^features/step_definitions/(.+)_steps\.rb$}) { |m| Dir[File.join("**/#{m[1]}.feature")][0] || 'features' }
+end

data/README.md

@@ -43,7 +43,7 @@ __To View Command Options run:__ `bukkit [command] [options: -[-h]elp]`
 ###Prerequisites:
 
 * [Ruby](https://www.ruby-lang.org/en/downloads/) ([RVM](http://rvm.io/) - for Linux/Mac and [RubyInstaller](http://rubyinstaller.org/) - Windows)
-  * `2.0.0` (recommended!)
+  * `2.1.0` or `2.0.0` (recommended!)
   * `1.9.3` (go right ahead)
   * `other versions` (may or may not work, if you find a bug though [report it!](https://github.com/JesseHerrick/bukkit/issues/new))
 * [Java](http://java.com/en/download/manual.jsp)
@@ -58,3 +58,4 @@ To file a feature request just create an issue [here.](https://github.com/JesseH
 To contribute to this awesome project just [fork it](https://github.com/JesseHerrick/Bukkit-CLI/fork) and send a [pull request](https://github.com/JesseHerrick/Bukkit-CLI/pulls).
 
 Please follow the [Ruby Styleguide](https://github.com/styleguide/ruby). If you have any questions please feel free to [email me.](mailto:school@jessegrant.net)
+

data/Rakefile

@@ -8,42 +8,10 @@
 require "rubygems"
 require "rake"
 require "colorize"
-require 'cucumber'
-require 'cucumber/rake/task'
+require "cucumber"
+require "cucumber/rake/task"
+require "bundler/gem_tasks"
 
-Cucumber::Rake::Task.new(:features) do |t|
+Cucumber::Rake::Task.new(:default) do |t|
     t.cucumber_opts = "features --format pretty"
 end
-
-# Helpers
-def test(filename)
-    puts `ruby -I . test/test_#{filename}.rb`
-end
-
-# Tasks
-desc "Default task."
-task :default do
-    puts `rake test`
-    puts "Gem seems to be in tip top shape!".green
-    puts "Run: ".yellow + "`bukkit --help` to list all commands."
-end
-
-desc "Build gem."
-task :build do
-    puts "Starting gem build...".yellow
-    puts "          Building...".yellow
-    `gem build bukkit.gemspec`
-
-    puts "bukkit successfully built!".green
-    puts "Gems in this directory: ".yellow
-    Dir.glob("*.gem").each { |gem| puts "=> " + gem.yellow }
-end
-
-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/bukkit.gemspec

@@ -30,4 +30,7 @@ Gem::Specification.new do |spec|
 	spec.add_development_dependency('rake')
 	spec.add_development_dependency('cucumber')
 	spec.add_development_dependency('aruba')
+	spec.add_development_dependency('guard')
+	spec.add_development_dependency('guard-cucumber')
+	spec.add_development_dependency('libnotify')
 end

data/features/create.feature

@@ -4,5 +4,10 @@ Feature: Create Server
 	I want to be able to create a new server easily.
 
 	Scenario: Create a new server
-		When I run "bukkit new MC" with the options "--rb --no-start"
-		Then the file "MC/craftbukkit.jar" should exist
+		When I run `bukkit new MC --rb --nostart`
+		Then the file "MC/craftbukkit.jar" should exist
+		And the exit code should be 0
+
+	Scenario: Create a new server with no name
+		When I run `bukkit new`
+		Then the exit code should be 1

data/features/install.feature

@@ -0,0 +1,14 @@
+Feature: Install
+	In order to easily install plugins.
+	As a server admin.
+	I want to install a new plugin.
+
+	Scenario: Install WorldEdit
+		Given a simulated server "MC"
+		When I run `bukkit install WorldEdit`
+		Then the file "MC/plugins/WorldEdit.jar" should exist
+
+	Scenario: Install an unknown plugin
+		Given a simulated server "MC"
+		When I run `bukkit install jesse`
+		Then the exit code should be 1

data/features/step_definitions/bukkit_steps.rb

@@ -1,7 +1,31 @@
-When(/^I run "(.*?)" with the options "(.*?)"$/) do |command, options|
-	@output = `#{command} #{options}`
+Before do
+  @aruba_timeout_seconds = 85
 end
 
-Then(/^the exit status should be (\d+)$/) do |exit_status|
-	@last_exit_status.should == exit_status.to_i
+Then(/^the exit code should be (\d+)$/) do |exit_status|
+  @last_exit_status.should == exit_status.to_i
 end
+
+Then(/^the file "(.*?)" should exist$/) do |file|
+  File.exists?(file)
+end
+
+Given(/^a simulated server "(.*?)"$/) do |name|
+  Dir.mkdir("tmp") unless Dir.exists? "tmp"
+  Dir.chdir("tmp")
+  Dir.mkdir("MC") unless Dir.exists? "MC"
+  Dir.chdir("MC")
+  Dir.mkdir("plugins") unless Dir.exists? "plugins"
+
+  file = File.new("craftbukkit.jar", "w")
+  file.write("This is just a simulated jarfile.")
+  file.close
+end
+
+Then(/^the plugin "(.*?)" should not exist$/) do |name|
+  File.exists?("plugins/#{name}") == false
+end
+
+Then(/^the output should equal "(.*?)"$/) do |output|
+  @output == output
+end

data/features/support/env.rb

@@ -0,0 +1 @@
+require 'aruba/cucumber'

data/features/uninstall.feature

@@ -0,0 +1,19 @@
+Feature: Uninstall
+	In order to groom my plugins.
+	As a server admin.
+	I want to uninstall a plugin.
+
+	Scenario: Uninstall WorldEdit
+		Given a simulated server "MC"
+		And I run `bukkit install WorldEdit`
+		When I run `bukkit uninstall WorldEdit`
+		Then the plugin "WorldEdit.jar" should not exist
+
+	Scenario: Uninstall nothing
+		When I run `bukkit uninstall`
+		Then the exit code should be 1
+
+	Scenario: Uninstall a nonexistant plugin
+		Given a simulated server "MC"
+		When I run `bukkit uninstall WorldEdit`
+		Then the exit code should be 1

data/features/website.feature

@@ -0,0 +1,9 @@
+Feature: Website
+	In order to get more info about a plugin.
+	As a server admin who likes verbosity.
+	I want to get the website of a plugin.
+
+	Scenario: Get WorldEdit's plugin website
+		When I run `bukkit website WorldEdit --url`
+		Then the exit code should be 0
+		And the output should equal "Website: http://dev.bukkit.org/bukkit-plugins/worldedit"

data/lib/bukkit/create.rb

@@ -23,6 +23,12 @@ module Bukkit
 			puts "     Create: ".green + "#{@name}/"
 			Dir.chdir(@name)
 
+			# Fail gracefully on control + C (SIGINT)
+			trap("SIGINT") {
+				FileUtils.rm_rf(@name)
+				puts "#{@name} not created.".red
+			}
+
 			# Download build.
 			Bukkit::Server.download("http://dl.bukkit.org/latest-#{options[:build].to_s}/craftbukkit.jar")
 

data/lib/bukkit/download.rb

@@ -1,4 +1,5 @@
 require 'rest-client'
+require 'fileutils'
 
 module Bukkit
 	class Server
@@ -11,6 +12,13 @@ module Bukkit
 				filename = uri.split("\/").last
 			end
 
+			# Catch SIGINT if needed.
+			trap("SIGINT") {
+				puts "\nDownload failed.".red
+				FileUtils.rm(filename) if File.exists? filename
+				exit
+			}
+
 			# Give some friendly output.
 			puts "Downloading: ".yellow + filename
 			puts "       From: ".yellow + uri
@@ -23,7 +31,7 @@ module Bukkit
 			end
 			# => filename.ext
 
-			puts filename.light_green + " successfully downloaded!".green
+			puts filename.light_green + " successfully downloaded.".green
 		end
 	end
 end

data/lib/bukkit/uninstall.rb

@@ -23,7 +23,7 @@ module Bukkit
 
 				# Delete each matching file.
 				if delete.empty?
-					puts "No plugins found matching '#{name}'".yellow
+					abort "No plugins found matching '#{name}'".yellow
 				else
 					delete.each do |file|
 						if File.ftype(file) == "directory"

data/lib/bukkit/version.rb

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

metadata

@@ -1,153 +1,195 @@
 --- !ruby/object:Gem::Specification
 name: bukkit
 version: !ruby/object:Gem::Version
-  version: 2.4.2
+  version: 2.5.0
 platform: ruby
 authors:
 - Jesse Herrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-06 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: archive-zip
   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: colorize
   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: commander
   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: multi_json
   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: launchy
   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: rest-client
   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
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: aruba
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard-cucumber
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: libnotify
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: A command line wrapper for CraftBukkit.
@@ -158,18 +200,22 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .ruby-version
-- .travis.yml
+- ".gitignore"
+- ".ruby-version"
+- ".travis.yml"
 - Gemfile
-- Gemfile.lock
+- Guardfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/bukkit
 - bukkit.gemspec
 - features/create.feature
+- features/install.feature
 - features/step_definitions/bukkit_steps.rb
+- features/support/env.rb
+- features/uninstall.feature
+- features/website.feature
 - lib/bukkit.rb
 - lib/bukkit/create.rb
 - lib/bukkit/download.rb
@@ -179,11 +225,6 @@ files:
 - 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
@@ -194,25 +235,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: A command line wrapper for CraftBukkit. Manage your server easier.
 test_files:
 - features/create.feature
+- features/install.feature
 - features/step_definitions/bukkit_steps.rb
-- test/test_create.rb
-- test/test_download.rb
-- test/test_install.rb
-- test/test_update.rb
-- test/test_website.rb
+- features/support/env.rb
+- features/uninstall.feature
+- features/website.feature

data/test/test_create.rb

@@ -1,20 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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

@@ -1,22 +0,0 @@
-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

@@ -1,11 +0,0 @@
-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

@@ -1,10 +0,0 @@
-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