bukkit 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 981f91a3d08303caf986e007da651b85ea62beec
-  data.tar.gz: d13ab9caf699a983b325c75dc9cedcd20c7d06d2
+  metadata.gz: 15f530d8c4377ef0efe8388352f6d260f77113df
+  data.tar.gz: 79f7702c95236e6791488f710fad8036e36f0385
 SHA512:
-  metadata.gz: 9b751afbd45c32c73906aeebd779edb7d485cab9122d9c4499d364e7af4d131d2262aebcbe1ac7a6fddb9f70e8bdb0d930600ededab39d2f9af59003e532e223
-  data.tar.gz: 7e32935bbc1d74a00d8ff274e2a7d1495d22bd20976d990584588cb884d32f4a8d078350594bc1e39698d9b7d475d5d705ed92ac4969941a65712259ff3bce56
+  metadata.gz: 51606b8e0906b8b95a688cfccdfe9a56b952919e44ea85b305dc03b2d50ae492bc5ea886e8a61860ad8228036482a408d64d6e7fe0b4a93f622a2d7425f1f7eb
+  data.tar.gz: 0f11c78afbc3b4a78067bcb83d191b4570f4041b88ecdeb1f0d77ce57e79f2253a3da45b3253b7b751fc1dd1992bb82c521c36268a4d76492fc8f561719af0a1

data/.gitignore

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

data/CHANGELOG

@@ -6,4 +6,5 @@ v0.1.4: Much better documentation.
 v1.0.0: Total revamp of the CLI and docs. Definitely v1.0.
 v1.0.1: Got rid of the old docs.
 v1.0.2: Fixed some cosmetic things and bugs.
-v1.0.3: Just made the CLI little bit nicer.
+v1.0.3: Just made the CLI little bit nicer.
+v1.0.4: Better Windows support and '--force' option to the 'new' command.

data/Gemfile.lock

@@ -1,13 +1,12 @@
 PATH
   remote: .
   specs:
-    bukkit (1.0.2)
+    bukkit (1.1.0)
       archive-zip
       colorize
       commander
       json
       launchy
-      rake
 
 GEM
   remote: https://rubygems.org/
@@ -15,12 +14,12 @@ GEM
     addressable (2.3.5)
     archive-zip (0.6.0)
       io-like (>= 0.3.0)
-    colorize (0.5.8)
+    colorize (0.6.0)
     commander (4.1.5)
       highline (~> 1.6.11)
-    highline (1.6.19)
+    highline (1.6.20)
     io-like (0.3.0)
-    json (1.8.0)
+    json (1.8.1)
     launchy (2.3.0)
       addressable (~> 2.3)
     rake (10.1.0)
@@ -30,3 +29,5 @@ PLATFORMS
 
 DEPENDENCIES
   bukkit!
+  bundler
+  rake

data/README.md

@@ -3,6 +3,11 @@ Bukkit-CLI
 
 A Bukkit Server command line interface.
 
+![Gem Version](https://badge.fury.io/rb/bukkit.png)
+
+[![Dependency Status](https://gemnasium.com/JesseHerrick/Bukkit-CLI.png)](https://gemnasium.com/JesseHerrick/Bukkit-CLI) 
+[![Build Status](https://travis-ci.org/JesseHerrick/Bukkit-CLI.png?branch=master)](https://travis-ci.org/JesseHerrick/Bukkit-CLI) 
+
 ##Features (see [commands](https://github.com/JesseHerrick/Bukkit-CLI/blob/master/README.md#commands) for more details)
 * Automatically creates a new server (your choice of build: rb, beta, or dev) with a simple command.
 * Plugin manager. No more downloading and copying files.
@@ -18,13 +23,13 @@ A Bukkit Server command line interface.
 ```
 
 ###Commands:
-__To View Command Options run:__ `bukkit [command] [options: --help, -h]`
+__To View Command Options run:__ `bukkit [command] [options: -[-h]elp]`
 
 `bukkit [--help, -h]` Display global help.
 
 `bukkit install my-favorite-plugin` Install a new bukkit plugin.
 
-`bukkit new my-awesome-server-name [options: --rb, --beta, --dev]` Create a new Bukkit server.
+`bukkit new my-awesome-server-name [options: --rb, --beta, --dev, -[-f]orce (Overwrite any conflicting dirs.)], ` Create a new Bukkit server.
 
 `bukkit start` Start your server.
 

data/Rakefile

@@ -1,38 +1,40 @@
+#!/usr/bin/env ruby
+
+$: << File.expand_path(File.dirname(__FILE__) + "/../lib")
+
+# Lib Files
+require 'bukkit/version'
+
+# Gems
 require "rubygems"
 require "rake"
 require "colorize"
 
-desc "Install a new bukkit plugin."         
-task :install do
-	puts "Checking `install` command...".yellow
-	`bukkit install worldedit`
-end
-
-desc "Create a new Bukkit server."          
-task :new do
-	puts "Checking `new` command...".yellow
-	`bukkit new test --rb`
-end
-
-desc "Start your server."
-task :start do
-	puts "Checking `start` command...".yellow
-	check = `bukkit start`
-	puts check
+# Tasks
+desc "Get version"
+task :version do
+	version = Bukkit::VERSION_FULL.split
+	puts "#{version[0].blue} #{version[1].yellow}"
 end
 
-desc "Get the latest version of bukkit."
-task :update do
-
+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."
 end
 
-desc "Open a plugin's website."
-task :website do
+desc "Build gem."
+task :build do
+	puts "Starting gem build...".yellow
+	puts "          Building...".yellow
+	`gem build bukkit.gemspec`
 
-end
+	version = Bukkit::VERSION
+	puts "Bukkit-CLI successfully built! ".green + "Gem ".blue + "v" + version
 
-desc "Default task."
-task :default do
-	puts "Nothing to see here... move along.".green
-	puts "Run".yellow + " `bukkit new my-awesome-server-name`"
+	gem = Dir.glob("*.gem")[0]
+	Dir.mkdir("gem") unless Dir.exists?("gem")
+	FileUtils.mv(gem, "gem/")
+	puts " Gem: ".red + "#{Dir.getwd}/gem/" + gem.yellow
 end

data/bin/bukkit

@@ -18,6 +18,7 @@ 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.action do |args, options|
     # Make 'dir' = to first arg
@@ -42,8 +43,15 @@ command :new do |c|
 				abort "ERROR: Invalid option '#{build}'\nTry `bukkit new --help`"
 			end
 		end
+
+    if options.force == true
+      force = true
+    else
+      force = nil
+    end
+
     begin
-		  Bukkit::new(build, dir)
+		  Bukkit::new(build, dir, force)
     rescue TypeError
       abort "ERROR: Server name not specified.\nTry `bukkit new my-awesome-server-name`"
     end

data/bukkit.gemspec

@@ -18,10 +18,14 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency('json')
-  spec.add_dependency('archive-zip')
-  spec.add_dependency('launchy')
-  spec.add_dependency('commander')
-  spec.add_dependency('colorize')
-  spec.add_dependency('rake')
-end
+  # 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')
+
+  # Dev Dependencies
+  spec.add_development_dependency('bundler')
+  spec.add_development_dependency('rake')
+end

data/lib/bukkit/install.rb

@@ -36,13 +36,13 @@ module Bukkit
 				jarfiles = Dir.glob("*.jar")
 				# Move each jar file outside the folder.
 				jarfiles.each do |jar|
-					%x(mv #{jar} ../)
+					FileUtils.mv(jar, "../")
 				end
 				Dir.chdir("../")
 				# Delete the extracted folder.
-				%x(rm -rf #{plugin}/)
+				FileUtils.rm_r("#{plugin}/", :force => true)
 				# Delete the archive.
-				%x(rm #{filename})
+				FileUtils.rm_r("filename", :force => true)
 
 				puts "#{plugin.capitalize!} successfully installed!"
 

data/lib/bukkit/new.rb

@@ -1,9 +1,15 @@
 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)
+	def self.new(build, dir, force = false)
 		# Create a Folder for the Server
 		if Dir.exists?(dir)
-			abort "ERROR:".red + " Directory already exists. Try a different name."
+			# 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)
@@ -24,6 +30,9 @@ module Bukkit
 			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

data/lib/bukkit/version.rb

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

metadata

@@ -1,17 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: bukkit
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Jesse Herrick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-26 00:00:00.000000000 Z
+date: 2013-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: json
+  name: archive-zip
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: archive-zip
+  name: colorize
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: launchy
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -53,7 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -67,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -80,6 +80,20 @@ dependencies:
     - - '>='
       - !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
@@ -87,7 +101,7 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: