spigoter 0.2.0 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49b16dcbd14d8a17d43a7214a5c7f4eb5ae81e82
-  data.tar.gz: c417cd01039dc46c9ba9b0b815dd88129d67db9e
+  metadata.gz: 79a9acc769a4ed28bb5ba1c034afe8b57264bbee
+  data.tar.gz: 6c13746dc68d3eb762a3282dede574252dda4488
 SHA512:
-  metadata.gz: 0a1fe4db30c65152ee30bb84424efa407dcfe12c848c50ac40aded0a24c51cc7a52ccdf791f1eff0c860dc4729231da71478e71647a8daea913b7cda5aa36d8d
-  data.tar.gz: 9398c549d12ccb1dd4f2f6e3eb5b11a1a6a392d61e36b409660378d90e112e0f073225f43843dba0854458e37a49f59b31aee7361eaaa521bbd0e6d82aeb4f59
+  metadata.gz: bc161d28544f41888d47aa367ee4cfbe08570bf0ed736c380bf15fb16e585bb96ef498cb5da6686c874e67f6518a3fdd106917bc809c6277daf116e778a7c796
+  data.tar.gz: e6d952eaace7b1af4a0c45edcea2ac3f835a901072dd13143329f12787063a5ea89ca66b61b7dcb8876fa1ba382cb67012fef041e21c4d6cbe303230cb965a8d

data/README.md

@@ -11,17 +11,76 @@ Spigoter is a Ruby gem that gives you many tools make your server keepup easier.
 gem install spigoter
 ```
 
-## Usage
+## Features
 
 ### Run the server
-    spigoter
+    spigoter [--javaparam="-Xms1024M -Xmx4096M ..."]
 
 ### Update plugins
     spigoter {-u|--update} {all|plugin1,plugin2,...}
 
-### Compile spigot and set that version
+### 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"
+  }
+]
+```
+
+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/)
+
+#### Planned
+* [Spigot](https://www.spigotmc.org/)
+* Direct download
+* 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|...]
 
+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.
+
 ## Development
 
 After checking out the repo, run `bundle install` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
@@ -36,4 +95,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Daniel
 ## License
 
 The gem is available as open source under the terms of the [MIT License](http://opensource.org/licenses/MIT).
-

data/exe/spigoter

@@ -2,10 +2,10 @@
 
 require 'spigoter'
 require 'trollop'
-require 'json'
 
 
 opts = Trollop::options do
+	version "Spigoter v#{Spigoter::VERSION}"
     banner <<-EOS
 Spigoter, a command line utity for minecraft servers.
 
@@ -16,7 +16,9 @@ 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"
 end
 
+puts "Estas son las opciones: #{opts}"
 
 Spigoter::CLI.main(opts)

data/lib/spigoter/cli/cli.rb

@@ -10,6 +10,12 @@ module Spigoter
 				Spigoter::CLI.compile(opts)
 				return
 			end
+			if(opts[:version])
+				puts "Hola!"
+				puts Spigoter::VERSION
+				puts Spigoter::VERSION.class
+				return
+			end
 			Spigoter::CLI.start(opts)
 		end
 	end

data/lib/spigoter/cli/cli_update.rb

@@ -1,10 +1,9 @@
 module Spigoter
 	module CLI
 		def self.update(opts)
-			puts opts
 			Log.info "Updating!"
-			unless File.exists?('plugins.json')
-				Log.error "plugins.json doesn't exists, please, create one"
+			unless File.exists?('plugins.yml')
+				Log.error "plugins.yml doesn't exists, please, create one"
 				exit(1)
 			end
 			unless Dir.exists?('plugins')
@@ -12,17 +11,17 @@ module Spigoter
 				exit(1)
 			end
 
-			file = File.read("plugins.json")
-			plugins = JSON.parse(file)
-			plugins.each do |plugin_data|
-				Log.info "Getting plugin #{plugin_data['name']}"
+			file = File.read('plugins.yml')
+			plugins = YAML.load(file)
+			plugins.each do |name, data|
 				begin
-					hash = Plugins.get_plugin(plugin_data)
-					plugin_file = File.open("plugins/#{hash[:name]}", 'wb')
+					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 "#{plugin_data['name']} was downloaded correctly"
+					Log.info "#{name} was downloaded correctly"
 				rescue Exception => e
-					Log.error "Unkown source #{plugin_data['type']}"
+					Log.error "Unkown source #{data['type']}"
 				end
 			end
 		end

data/lib/spigoter/plugins.rb

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

data/lib/spigoter/version.rb

@@ -1,3 +1,3 @@
 module Spigoter
-  VERSION = "0.2.0"
+    VERSION = "0.2.2"
 end

data/lib/spigoter/webapi/curse.rb

@@ -14,7 +14,6 @@ module Spigoter
 		end
 		def main_page
 			return @main_page unless @main_page.nil?
-			Log.info "Downloading main page"
 			begin
 				@main_page = open(@url).read
 			rescue
@@ -24,7 +23,6 @@ module Spigoter
 		end
 		def download_page
 			return @download_page unless @download_page.nil?
-			Log.info "Downloading download page"
 			begin
 				@download_page = open(@url+'/download').read
 			rescue
@@ -35,23 +33,19 @@ module Spigoter
 		def download_url
 			return @download_url unless @download_url.nil?
 			download_page
-			Log.info "Parsing download url"
 			@download_url = /(?<download_url>http:\/\/addons.curse.cursecdn.com.+\.jar)/.match(@download_page)[:download_url]
 		end
 		def version
 			return @version unless @version.nil?
 			main_page
-			Log.info "Getting version"
 			@version = /Newest File: (?<version>.+)</.match(@main_page)[:version]
 		end
 		def name
 			return @name unless @name.nil?
-			Log.info "Getting name"
 			@name = /minecraft\/(?<name>.+)/.match(@url)[:name]
 		end
 		def download
 			download_url
-			Log.info "Downloading"
 			begin
 				file = open(@download_url).read
 			rescue

data/lib/spigoter/webapi/devbukkit.rb

@@ -14,7 +14,6 @@ module Spigoter
 		end
 		def main_page
 			return @main_page unless @main_page.nil?
-			Log.info "Downloading main page"
 			begin
 				@main_page = open(@url).read
 			rescue
@@ -25,35 +24,27 @@ module Spigoter
 		def download_page
 			return @download_page unless @download_page.nil?
 			main_page
-			Log.info "Downloading download page"
 			url_download_page = @main_page.match(/<a href="(?<download_page_url>.+)">Download/)[:download_page_url]
-			begin
-				@download_page = open("http://dev.bukkit.org/#{url_download_page}").read
-			rescue
-				raise "404 Error, that plugin URL doesn't exists"
-			end
+			@download_page = open("http://dev.bukkit.org/#{url_download_page}").read
+			# Don't need to begin-rescue, it's done by main_page
 			return @download_page
 		end
 		def download_url
 			return @download_url unless @download_url.nil?
 			download_page
-			Log.info "Parsing download url"
 			@download_url = /href="(?<download_url>.+)">Download/.match(@download_page)[:download_url]
 		end
 		def version
 			return @version unless @version.nil?
 			download_page
-			Log.info "Getting version"
 			@version = /3">\s*<h1>\s+(?<version>.+)\s+<\/h1>/.match(@download_page)[:version]
 		end
 		def name
 			return @name unless @name.nil?
-			Log.info "Getting name"
 			@name = /ins\/(?<name>[a-z\-]+)\/?/.match(@url)[:name]
 		end
 		def download
 			download_url
-			Log.info "Downloading"
 			begin
 				file = open(@download_url).read
 			rescue

data/spigoter.gemspec

@@ -37,6 +37,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "yard", "~> 0.8"
   spec.add_development_dependency "trollop", "~> 2.1"
 
-  spec.add_runtime_dependency "json", "~> 1.8"
   spec.add_runtime_dependency "logging", "~> 2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spigoter
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.2
 platform: ruby
 authors:
 - Daniel Ramos
@@ -136,20 +136,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-- !ruby/object:Gem::Dependency
-  name: json
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: logging
   requirement: !ruby/object:Gem::Requirement