calavera-tomcat-rails 0.1.0 → 0.1.1

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/lib/tomcat-rails/command_line_parser.rb

@@ -0,0 +1,47 @@
+module TomcatRails
+  require 'optparse'
+  
+  class CommandLineParser
+    def self.parse
+      default_options = {
+        :port => '3000',
+        :environment => 'development',
+        :context_path => '/', 
+      }
+      
+      parser = OptionParser.new do |opts|
+        opts.banner = 'Tomcat server default options:'
+        opts.separator ''
+
+        opts.on('-e', '--env ENVIRONMENT', 'Rails environment', 
+            "default: #{default_options[:environment]}") do |v| 
+          default_options[:environment] = v
+        end
+        
+        opts.on('-p', '--port PORT', 'Port to bind to', 
+            "default: #{default_options[:port]}") do |v| 
+          default_options[:port] = v
+        end
+        
+        opts.on('-c', '--context CONTEXT_PATH', 'The application context path', 
+            "default: #{default_options[:context_path]}") do |v| 
+          default_options[:context_path] = v
+        end
+        
+        opts.on('-v', '--version', 'display the current version') do
+          puts File.read(File.join(File.dirname(__FILE__), '..', '..', 'VERSION')).chomp
+          exit
+        end
+        
+        opts.on('-h', '--help', 'display the help') do
+          puts opts
+          exit
+        end
+          
+        opts.parse!(ARGV)
+      end
+      
+        default_options
+    end
+  end
+end

data/lib/tomcat-rails/server.rb

@@ -63,13 +63,12 @@ module TomcatRails
       web_app.addParameter('jruby.initial.runtimes', @config[:jruby_min_runtimes].to_s)
       web_app.addParameter('rails.env', @config[:environment].to_s)
       web_app.addParameter('rails.root', '/')
+      web_app.addParameter('public.root', '/public')
+      
     end
     
     def add_web_dir_resources(web_app)
-      dir_context = TomcatRails::Tomcat::FileDirContext.new
-      dir_context.setDocBase(File.join(Dir.pwd, "public"))
-      
-      web_app.setResources(dir_context)
+      web_app.setDocBase(File.join(Dir.pwd, "public/"))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: calavera-tomcat-rails
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - David Calavera
@@ -33,6 +33,7 @@ files:
 - VERSION
 - bin/tomcat_rails
 - lib/tomcat-rails.rb
+- lib/tomcat-rails/command_line_parser.rb
 - lib/tomcat-rails/jars.rb
 - lib/tomcat-rails/server.rb
 - test/test_helper.rb