spigoter 0.2.2 → 0.3.0

data/.travis.yml

@@ -2,6 +2,9 @@ language: ruby
 rvm:
   - 2.3.0 # My ruby version
   - 2.2.4
-before_install: gem install bundler
+before_install:
+  - gem install bundler
+  - sudo apt-get -qq update
+  - sudo apt-get install git openjdk-7-jre-headless tar
 notifications:
   email: false

data/Guardfile

@@ -52,7 +52,7 @@ guard :rspec, cmd: "bundle exec rspec" do
     file_changed = m.first.sub("lib/spigoter/", "").sub(".rb", "")
     "spec/#{file_changed}_spec.rb"
   end
-  watch(/exe\/spigoter/) do |m|
+  watch(/exe\/spigoter/) do
     "spec/cli_spec.rb"
   end
 

data/README.md

@@ -1,9 +1,13 @@
 # Spigoter
 
-[![Build Status](https://travis-ci.org/DanielRamosAcosta/spigoter.svg?branch=master)](https://travis-ci.org/DanielRamosAcosta/spigoter) [![Coverage Status](https://coveralls.io/repos/github/DanielRamosAcosta/spigoter/badge.svg?branch=master)](https://coveralls.io/github/DanielRamosAcosta/spigoter?branch=master) [![Dependency Status](https://gemnasium.com/DanielRamosAcosta/spigoter.svg)](https://gemnasium.com/DanielRamosAcosta/spigoter) [![Gem Version](https://badge.fury.io/rb/spigoter.svg)](https://badge.fury.io/rb/spigoter)
+[![Gem Version](https://img.shields.io/gem/v/spigoter.svg?style=flat-square)](https://badge.fury.io/rb/spigoter)
+[![Build Status](https://img.shields.io/travis/DanielRamosAcosta/spigoter.svg?style=flat-square)](https://travis-ci.org/DanielRamosAcosta/spigoter)
+[![Coverage Status](https://img.shields.io/coveralls/DanielRamosAcosta/spigoter.svg?style=flat-square)](https://coveralls.io/github/DanielRamosAcosta/spigoter?branch=master)
+[![Code Climate](https://img.shields.io/codeclimate/github/DanielRamosAcosta/spigoter.svg?style=flat-square)](https://codeclimate.com/github/DanielRamosAcosta/spigoter)
+[![Dependency Status](https://img.shields.io/gemnasium/DanielRamosAcosta/spigoter.svg?style=flat-square)](https://gemnasium.com/DanielRamosAcosta/spigoter)
 
 
-Spigoter is a Ruby gem that gives you many tools make your server keepup easier.
+Spigoter is a Ruby gem that gives you many tools in order to make your server keepup easier.
 
 ## Installation
 
@@ -14,59 +18,42 @@ gem install spigoter
 ## Features
 
 ### Run the server
-    spigoter [--javaparam="-Xms1024M -Xmx4096M ..."]
+    spigoter start
 
 ### Update plugins
-    spigoter {-u|--update} {all|plugin1,plugin2,...}
-
-### Usage
-You have to drop a `plugin.json` file in the server root directory. There will be saved some relevant information of plugins, as well as some customization.
-
-Example:
-
-```json
-[
-  {
-    "name": "Authme",
-    "url": "http://mods.curse.com/bukkit-plugins/minecraft/authme-reloaded",
-    "type": "curse",
-    "last_update": "31-3-2016 - 0:40"
-  },
-  {
-    "name": "BossShop",
-    "url": "http://mods.curse.com/bukkit-plugins/minecraft/bossshop",
-    "type": "curse",
-    "last_update": "31-3-2016 - 0:40"
-  },
-  {
-    "name": "ChestShop",
-    "url": "https://www.spigotmc.org/resources/1-9-chestshop.19511/",
-    "type": "spigotmc",
-    "last_update": "31-3-2016 - 0:40"
-  },
-  {
-    "name": "ChopTree",
-    "url": "https://www.spigotmc.org/resources/choptree.2046/",
-    "type": "spigotmc",
-    "last_update": "31-3-2016 - 0:40"
-  },
-  {
-    "name": "ClickSort",
-    "url": "http://mods.curse.com/bukkit-plugins/minecraft/clicksort",
-    "type": "curse",
-    "last_update": "31-3-2016 - 0:40"
-  },
-  {
-    "name": "Dynmap",
-    "url": "http://dev.bukkit.org/media/files/911/888/dynmap-2.3-alpha-1.jar",
-    "type": "direct",
-    "keep_eye_on": "http://dev.bukkit.org/bukkit-plugins/dynmap/files/",
-    "last_update": "31-3-2016 - 0:40"
-  }
-]
+    spigoter update [--list=plugin1,plugin2,...]
+
+#### Usage
+You have to drop a `plugin.yml` file in the server root directory. There will be saved some relevant information of plugins, as well as some customization.
+
+Basic example:
+
+```yml
+Authme:
+  type: curse
+  url: "http://mods.curse.com/bukkit-plugins/minecraft/authme-reloaded"
+ChopTree:
+  type: spigotmc
+  url: "https://www.spigotmc.org/resources/choptree.2046/"
+Dynmap:
+  type: devbukkit
+  url: "http://dev.bukkit.org/bukkit-plugins/dynmap/"
+Essentials:
+  type: direct
+  url: "https://hub.spigotmc.org/jenkins/job/Spigot-Essentials/lastSuccessfulBuild/artifact/Essentials/target/Essentials-2.x-SNAPSHOT.jar"
+  keep_eye_on: "https://hub.spigotmc.org/jenkins/job/Spigot-Essentials/"
+EssentialsChat:
+  type: direct
+  url: "https://hub.spigotmc.org/jenkins/job/Spigot-Essentials/lastSuccessfulBuild/artifact/EssentialsChat/target/EssentialsChat-2.x-SNAPSHOT.jar"
+Multiverse-core:
+  keep_eye_on: "http://mods.curse.com/bukkit-plugins/minecraft/multiverse-core"
+  type: direct
+  url: "http://ci.onarandombox.com/job/Multiverse-Core/lastSuccessfulBuild/artifact/target/Multiverse-Core-2.5.jar"
+Towny:
+  type: manual
+  url: "http://palmergames.com"
 ```
 
-I'm trying to switch to YAML.
 #### Currently suported plugin hosted sites
 * [Curse](http://mods.curse.com/bukkit-plugins/minecraft)
 * [BukkitDev](http://dev.bukkit.org/)
@@ -74,10 +61,11 @@ I'm trying to switch to YAML.
 #### Planned
 * [Spigot](https://www.spigotmc.org/)
 * Direct download
+* Manual
 * Custom download via piping (first download, second unrar, then extract X file, ...)
 
-### Compile Spigot and set version
-    spigoter {-c|--compile} [lastest|1.9|1.8|...]
+### Update Spigot's version
+    spigoter compile [--version={1.9|1.8|...}]
 
 This command excecute the `buildtools .jar` in a `build`directory in the root server folder. Then, it'll replace the old version with the new one.
 

data/exe/spigoter

@@ -1,24 +1,71 @@
 #!/usr/bin/env ruby
 
 require 'spigoter'
-require 'trollop'
-
-
-opts = Trollop::options do
-	version "Spigoter v#{Spigoter::VERSION}"
-    banner <<-EOS
-Spigoter, a command line utity for minecraft servers.
-
-Usage:
-       spigoter [options]
-where [options] are:
-EOS
-    opt :javaparm, 'Sets the java parameters', :default => '-Xms1024M -Xmx4096M -jar spigot.jar' #TODO: Poner esto aqui
-	opt :compile, "Compiles spigot and sets the new version"
-	opt :update, "Set permissons plugin"
-	opt :version, "Get spigoter version"
+require 'optparse'
+
+options = {}
+
+subtext = <<HELP
+COMMAND are:
+   start [options]    starts the server
+   update [options]   updates plugin
+   compile [options]  compiles spigot and replaces as the current version
+
+See '#{File.basename $0} COMMAND --help' for more information on a specific command.
+HELP
+
+global = OptionParser.new do |opts|
+    opts.banner = "Usage: #{File.basename $0} <COMMAND> [options]"
+    opts.separator ""
+    opts.separator subtext
+    opts.on_tail("-v", "--version", "Show version information about this program and quit.") do
+        puts "Spigoter v#{Spigoter::VERSION}"
+        exit
+    end
+end
+
+subcommands = {
+    'init' => OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename $0} init"
+        opts.separator "\nCreates a new spigoter.yml for you"
+    end,
+    'start' => OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename $0} start"
+        opts.separator "\nStarts the server"
+    end,
+    'update' => OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename $0} update [options]"
+        opts.on("-l", "--list=[x,y,z]", Array, "list of plugins to update") do |par|
+            options[:list] = par
+        end
+        opts.on("-f", "--force", "forces to updates all plugins, even if no new version was found") do |par|
+            options[:force] = par
+        end
+        opts.separator "\nUpdates the plugins"
+    end,
+    'compile' => OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename $0} update [options]"
+        opts.on("-v", "--version version", "version of spigot to compile (lastest by default)") do |par|
+            options[:version] = par
+        end
+        opts.separator "\nCompiles spigot and sets it as the current version"
+    end
+}
+
+global.order!
+
+command = ARGV.shift
+
+begin
+    subcommands[command].order!
+rescue
+    Log.error "Unrecognized subcommand or param, do #{File.basename $0} --help"
+    exit(1)
 end
 
-puts "Estas son las opciones: #{opts}"
+#puts "Command: #{command} "
+#p options
+#puts "ARGV:"
+#p ARGV
 
-Spigoter::CLI.main(opts)
+Spigoter::CLI::run(command, options)

data/lib/spigoter.rb

@@ -1,12 +1,14 @@
 require "spigoter/version"
 require "spigoter/log/log"
+require 'spigoter/utils'
 require 'spigoter/plugins'
+require 'spigoter/webapi/plugin'
 require 'spigoter/webapi/curse'
 require 'spigoter/webapi/devbukkit'
+require 'spigoter/cli/cli'
 require 'spigoter/cli/cli_update'
 require 'spigoter/cli/cli_compile'
 require 'spigoter/cli/cli_start'
-require 'spigoter/cli/cli'
 
 module Spigoter
   # Your code goes here...

data/lib/spigoter/cli/cli.rb

@@ -1,22 +1,18 @@
 module Spigoter
 	module CLI
-		def self.main(opts)
-			Log.info "Estoy en la main, mi opts son: #{opts}"
-			if(opts[:update])
-				Spigoter::CLI.update(opts)
-				return
-			end
-			if(opts[:compile])
-				Spigoter::CLI.compile(opts)
-				return
-			end
-			if(opts[:version])
-				puts "Hola!"
-				puts Spigoter::VERSION
-				puts Spigoter::VERSION.class
-				return
+		def self.run(command, opts={})
+			Run.new.task[command].call(opts)
+		end
+
+		class Run
+			attr_reader :task
+			def initialize
+				@task = {
+					'update' => Spigoter::CLI.update,
+					'compile' => Spigoter::CLI.compile,
+					'start' => Spigoter::CLI.start
+				}
 			end
-			Spigoter::CLI.start(opts)
 		end
 	end
 end

data/lib/spigoter/cli/cli_compile.rb

@@ -1,7 +1,36 @@
 module Spigoter
 	module CLI
-		def self.compile(opts)
-			puts opts
+		def self.compile
+			return Compile::compile
+		end
+		module Compile
+			def self.compile
+				return lambda do |opts|
+					main(opts)
+				end
+			end
+			def self.main(opts = {})
+				if !Spigoter::Utils.which('java').nil? and !Spigoter::Utils.which('git').nil?
+					Log.info "Compiling Spigot!"
+					FileUtils.mkdir_p 'build'
+					Dir.chdir('build')
+					unless File.exist?('BuildTools.jar')
+						file = Spigoter::Utils.download('https://hub.spigotmc.org/jenkins/job/BuildTools/lastSuccessfulBuild/artifact/target/BuildTools.jar')
+						File.open('BuildTools.jar', 'wb').write(file)
+					end
+					if opts[:version].nil?
+						Log.info "Compiling lastest spigot version"
+						system("java -jar BuildTools.jar")
+					else
+						Log.info "Compiling spigot version #{opts[:version]}"
+						system("java -jar BuildTools.jar --rev #{opts[:version]}")
+					end
+					Dir.chdir('..')
+					FileUtils.cp(Dir['build/spigot*.jar'].first, 'spigot.jar')
+				else
+					Log.error "You don't have java or git in PATH"
+				end
+			end
 		end
 	end
 end

data/lib/spigoter/cli/cli_start.rb

@@ -1,24 +1,22 @@
 module Spigoter
 	module CLI
-		def self.start(opts)
-			unless which('java').nil?
-				Log.info "Starting the server!"
-				system("java #{opts[:javaparm]}")
-			else
-				Log.error "You don't have java in PATH"
-			end
+		def self.start
+			return Start::start
 		end
-
-		def self.which(cmd)
-			# http://stackoverflow.com/questions/2108727/which-in-ruby-checking-if-program-exists-in-path-from-ruby
-			exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
-			ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
-				exts.each { |ext|
-					exe = File.join(path, "#{cmd}#{ext}")
-					return exe if File.executable?(exe) && !File.directory?(exe)
-				}
+		module Start
+			def self.start
+				return lambda do |opts|
+					main(opts)
+				end
+			end
+			def self.main(opts = {})
+				unless Spigoter::Utils.which('java').nil?
+					Log.info "Starting the server!"
+					system("java #{opts[:javaparm]} -jar spigot.jar")
+				else
+					Log.error "You don't have java in PATH"
+				end
 			end
-			return nil
 		end
 	end
 end

data/lib/spigoter/cli/cli_update.rb

@@ -1,27 +1,44 @@
 module Spigoter
 	module CLI
-		def self.update(opts)
-			Log.info "Updating!"
-			unless File.exists?('plugins.yml')
-				Log.error "plugins.yml doesn't exists, please, create one"
-				exit(1)
-			end
-			unless Dir.exists?('plugins')
-				Log.error "plugins directory doesn't exists, please, create it"
-				exit(1)
+		def self.update
+			return Update::update
+		end
+		module Update
+			def self.update
+				return lambda do |opts|
+					main(opts)
+				end
 			end
+			def self.main(opts)
+				Log.info "Updating!"
+				unless File.exist?('plugins.yml')
+					Log.error "plugins.yml doesn't exists, please, create one (you can use spigoter init)"
+					exit(1)
+				end
+				unless Dir.exist?('plugins')
+					Log.error "plugins directory doesn't exists, please, create it"
+					exit(1)
+				end
+
+				file = File.read('plugins.yml')
+				plugins_data = YAML.load(file)
+				list = plugins_data.keys
+				unless opts[:list].nil?
+					unless opts[:list].empty?
+						list = opts[:list]
+					end
+				end
 
-			file = File.read('plugins.yml')
-			plugins = YAML.load(file)
-			plugins.each do |name, data|
-				begin
-					Log.info "Starting to download #{name}"
-					hash = Plugins.get_plugin(name, data)
-					plugin_file = File.open("plugins/#{name}.jar", 'wb')
-					plugin_file.write(hash[:file])
-					Log.info "#{name} was downloaded correctly"
-				rescue Exception => e
-					Log.error "Unkown source #{data['type']}"
+				list.each do |plugin|
+					begin
+						Log.info "Starting to download #{plugin}"
+						hash = Plugins.get_plugin(plugin, plugins_data[plugin])
+						plugin_file = File.open("plugins/#{plugin}.jar", 'wb')
+						plugin_file.write(hash[:file])
+						Log.info "#{plugin} was downloaded correctly"
+					rescue
+						Log.error "Unkown source #{plugins_data[plugin]['type']}"
+					end
 				end
 			end
 		end

data/lib/spigoter/plugins.rb

@@ -1,18 +1,17 @@
 module Spigoter
 	module Plugins
 		def self.get_plugin(name, data)
+			f = nil
 			case data['type']
 				when 'curse'
-					f = Spigoter::PluginCurse.new(data['url']).download
-					hash = {:name => "#{name}.jar", :file => f}
-					return hash
+					f = Spigoter::PluginCurse.new(data['url']).file
 				when 'devbukkit'
-					f = Spigoter::PluginBukkit.new(data['url']).download
-					hash = {:name => "#{name}.jar", :file => f}
-					return hash
+					f = Spigoter::PluginBukkit.new(data['url']).file
 				else
 					raise "Unkown source"
 			end
+			hash = {:name => "#{name}.jar", :file => f}
+			return hash
 		end
 	end
 end