madride 1.0.1 → 1.0.2

data/bin/madride

@@ -12,7 +12,7 @@ require 'rack'
 # Options container. Filled in with default values.
 #
 
-options = { :host => '0.0.0.0', :port => 3000, :data => {}, :paths => [] }
+options = { :host => '0.0.0.0', :port => 3000, :data => {} }
 
 #
 # Parse options
@@ -41,7 +41,8 @@ OptionParser.new("", 24, '  ') do |opts|
   end
 
   opts.on("-d", "--data FILE", "read data from yaml FILE") do |file|
-    options[:data].merge! YAML.load_file file
+    data = YAML.load_file file
+    options[:data].merge! data if data.is_a? Hash
   end
 
   #
@@ -58,7 +59,7 @@ OptionParser.new("", 24, '  ') do |opts|
   #
 
   begin
-    opts.order(ARGV){ |path| options[:paths] << path }
+    opts.parse!
   rescue OptionParser::ParseError => e
     opts.warn e.message
     exit 1
@@ -68,7 +69,7 @@ OptionParser.new("", 24, '  ') do |opts|
   # We need at least one path
   #
 
-  if options[:paths].empty?
+  if ARGV.empty?
     opts.warn "No paths given. See `madride --help` for usage info."
     exit 1
   end
@@ -84,7 +85,7 @@ environment = Madride::Environment.new Dir.pwd
 # Fill in paths
 #
 
-options[:paths].each{ |path| environment.append_path path }
+ARGV.each{ |path| environment.append_path path }
 
 #
 # Start server

data/lib/madride/version.rb

@@ -1,3 +1,3 @@
 module Madride
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

data/madride.gemspec

@@ -4,7 +4,7 @@ require File.expand_path('../lib/madride/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.name          = "madride"
   gem.version       = Madride::VERSION
-  gem.homepage      = ""
+  gem.homepage      = "https://github.com/madride/madride"
   gem.authors       = ["Aleksey V Zapparov"]
   gem.email         = ["ixti@member.fsf.org"]
   gem.summary       = "madride-#{Madride::VERSION}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: madride
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-27 00:00:00.000000000 Z
+date: 2012-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -160,7 +160,7 @@ files:
 - spec/fixtures/pages/music/bands.html.slim
 - spec/server_spec.rb
 - spec/spec_helper.rb
-homepage: ''
+homepage: https://github.com/madride/madride
 licenses: []
 post_install_message: 
 rdoc_options: []
@@ -183,7 +183,7 @@ rubyforge_project:
 rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
-summary: madride-1.0.1
+summary: madride-1.0.2
 test_files:
 - spec/.gitkeep
 - spec/environment_spec.rb