rblock 0.0.2 → 0.0.3

data/README.md

@@ -8,6 +8,7 @@ Make sure your server has the following installed:
 
 * GNU screen
 * Java
+* Ruby 1.9
 
 In your console, type:
 
@@ -43,3 +44,10 @@ Rblock will start your server. Yup! It's that simple.
 * duplicate servers
 * template servers
 * extend with bots and extensions
+
+# Version History
+
+## 0.0.3
+
+* Added --directory flag to most commands
+* Fixed some bugs regarding the creation of blogs

data/bin/rblock

@@ -9,6 +9,7 @@ require_relative '../lib/rblock.rb'
 SUB_COMMANDS = %w(new start stop say console install mv)
 $global_opts = Trollop::options do
   banner "rblock: #{Rblock::tagline}"
+  opt :force, "force"
   stop_on SUB_COMMANDS
 end
 
@@ -16,31 +17,41 @@ $cmd = ARGV.shift # get the subcommand
 $cmd_opts = case $cmd
   when "install" # parse new options
     Trollop::options do
-      banner "usage: rblock install [options] <server path>"
-      banner ''
-      opt :bukkit, "use bukkit", :default => true
-      opt :version, "server version", :type => :string, :default => "latest"
+      banner <<-EOS
+Installs minecraft servers.
+
+Usage:
+       rblock install [options] <server directory>
+where [options] are:
+EOS
+      opt :beta, "use beta version of bukkit"
+      opt :bukkit, "bukkit file", :type => :string, :default => nil
      "Options are official, beta, bukkit, bukkit-beta, or a version number."
     end
   when "start" # parse start options
     Trollop::options do
-      banner "usage: rblock start"
+      banner "usage: rblock start [options]"
       banner ''
+      opt :directory, "directory", :type => :string, :default => "."
+      opt :instant, "instant"
     end
   when "stop" # parse stop options
     Trollop::options do
-      banner "usage: rblock stop"
+      banner "usage: rblock stop [options]"
       banner ''
+      opt :directory, "directory", :type => :string, :default => "."
     end
   when "console" # parse console options
     Trollop::options do
-      banner "usage: rblock console"
+      banner "usage: rblock console [options]"
       banner ''
+      opt :directory, "directory", :type => :string, :default => "."
     end
   when "say" # parse say options
     Trollop::options do
-      banner "usage: rblock say"
+      banner "usage: rblock say <message>"
       banner ''
+      opt :directory, "directory", :type => :string, :default => "."
     end
   when nil
     puts "rblock: minecraft server management"
@@ -60,16 +71,19 @@ def confirm(action)
   end
 end
 
+# is there a server directory specified? If so, cd to that
+if defined? $cmd_opts[:directory]
+  Dir.chdir($cmd_opts[:directory])
+end
+
 case $cmd
 when "install"
   if ARGV[0] == nil
     Trollop::die "no server name specified"
   else
-    server_path = ARGV[0].split('/')
+    server_path = ARGV[0]
   end
 
-  # if multifolder file path, server name is just last bit
-  server_name = server_path.last
 
   puts "Checking dependencies..."
 
@@ -87,15 +101,14 @@ when "install"
   puts "\nCreating server directory..."
 
   # make the server directory
+  # mkdir_p creates all the intermediate folders, if specified
+  FileUtils.mkdir_p server_path
 
-  server_path.each_with_index do |value, i|
-    begin
-      Dir.mkdir server_path[0..i].join('/')
-    rescue Errno::EEXIST
-    end
-  end
 
-  Dir.chdir(server_path.join('/')) do
+  Dir.chdir(server_path) do
+    # server name is the server's folder name
+    server_name = FileUtils.pwd.split("/").last
+
     puts "Downloading bukkit..."
     if $cmd_opts[:beta]
       Rblock::fetch_bukkit('http://cbukk.it/craftbukkit-beta.jar', 'craftbukkit.jar')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rblock
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-09 00:00:00.000000000 Z
+date: 2013-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize