nailgun 0.0.2 → 0.0.3

data/README.markdown

@@ -19,7 +19,7 @@ Install
 <code>rake nailgun</code>
 
 OR
-<code> sudo gem insatll nailgun </code>
+<code> sudo gem install nailgun </code>
 
 
 

data/lib/generator/nailgun_binary

@@ -6,7 +6,7 @@ Nailgun::NailgunConfig.options =
   {
     :java_bin => "java",
     :server_address =>'localhost',
-    :port_no=>'2114'
+    :port_no=>'2113'
   }
   
 Nailgun::NailgunServer.new(ARGV).daemonize

data/lib/nailgun.rb

@@ -1,35 +1,31 @@
-#require 'optparse'
+require 'optparse'
 require 'nailgun_config'
 require 'ng_command'
 
 module Nailgun
-	class NailgunServer
-		attr_accessor :args,:nailgun_options
-		def initialize(args)
-			raise ArgumentError,"please specify start|stop|-h" if args.empty?
-			opts = OptionParser.new do |opts|
-				opts.banner = "Usage: #{File.basename($0)} start|stop"
-				opts.on('-h', '--help', 'Show this message') do
-					puts "Use: start to start server"
-					puts "Use: stop to stop server"
-					puts opts
-					exit 1
-				end
-			end
-			@args = opts.parse!(args)
-		end
+  class NailgunServer
+    attr_accessor :args, :nailgun_options
 
-		def daemonize
-			if @args.include?('start')
-				Nailgun::NgCommand.start_server
-			elsif @args.include?('stop')
-				Nailgun::NgCommand.stop_server
-			end
-		end
-	end
+    def initialize(args)
+      raise ArgumentError, "please specify start|stop|-h" if args.empty?
+      opts = OptionParser.new do |opts|
+        opts.banner = "Usage: #{File.basename($0)} start|stop"
+        opts.on('-h', '--help', 'Show this message') do
+          puts "Use: start to start server"
+          puts "Use: stop to stop server"
+          puts opts
+          exit 1
+        end
+      end
+      @args = opts.parse! args
+    end
 
+    def daemonize
+      if @args.include? 'start'
+        Nailgun::NgCommand.start_server
+      elsif @args.include? 'stop'
+        Nailgun::NgCommand.stop_server
+      end
+    end
+  end
 end
-
-
-
-

data/lib/nailgun_config.rb

@@ -1,15 +1,14 @@
 module Nailgun
- class NailgunConfig
+  class NailgunConfig
     # default options
-		class << self
-			attr_accessor :options
-		end
+    class << self
+      attr_accessor :options
+    end
     NailgunConfig.options= {
       :java_bin => "java",
       :server_address => 'localhost',
       :port_no=>'2113',
       :run_mode => :once
     }
-
- end
+  end
 end

data/lib/ng_command.rb

@@ -1,62 +1,74 @@
-#require 'nailgun_config'
 module Nailgun
-	class NgCommand
-	  if RUBY_PLATFORM =~ /linux/
-      if RUBY_PLATFORM =~ /x86_64/
-          OS_PLATFORM = 'linux64'
-      else
-        OS_PLATFORM = 'linux32'
-      end
-   elsif RUBY_PLATFORM =~ /darwin/
+
+  class NgCommand
+
+    case RUBY_PLATFORM
+    when /linux.*x86_64|x86_64.*linux/
+      OS_PLATFORM = 'linux64'
+    when /linux/
+      OS_PLATFORM = 'linux32'
+    when /darwin/
       OS_PLATFORM = 'darwin'
-   else
-     OS_PLATFORM = 'win32'
-   end
-  begin
-	  NGPATH = File.expand_path(File.join(File.dirname(__FILE__), 'java','bin',OS_PLATFORM,'ng'))
-  rescue Exception
-    puts "cant find os version"
+    else
+      OS_PLATFORM = 'win32'
+    end
+
+    begin
+      NGPATH = File.expand_path(File.join(File.dirname(__FILE__), 'java', 'bin', OS_PLATFORM, 'ng'))
+    rescue NameError
+      raise "OS cannot be identified"
+    end
+
+    JAVAPATH = Nailgun::NailgunConfig.options[:java_bin]
+    NGJAR = File.expand_path(File.join(File.dirname(__FILE__), 'java','jar','nailgun-0.7.1.jar'))
+
+    def self.start_server(config={})
+      execute_command config do |p, s|
+        "nohup #{JAVAPATH} -jar #{NGJAR} #{s}:#{p} > /dev/null 2>&1 &"
+      end
+    end
+
+    def self.stop_server(config={})
+      execute_command config do |p, s|
+        "#{NGPATH} --nailgun-port #{p} --nailgun-server #{s} ng-stop"
+      end
+    end
+
+    def self.add_cps(paths, config={})
+      paths.each { |path| ng_cp path, config }
+    end
+
+    def self.ng_cp(absolute_jar_path="", config={})
+      execute_command config do |p, s|
+        "#{NGPATH} --nailgun-port #{p} --nailgun-server #{s} ng-cp #{absolute_jar_path}"
+      end
+    end
+
+    def self.ng_alias(alias_name, class_name, config={})
+      execute_command config do |p, s|
+        "#{NGPATH} --nailgun-port #{p} --nailgun-server #{s} ng-alias #{alias_name} #{class_name}"
+      end
+    end
+
+    def self.ng_version
+      system "#{NGPATH} --nailgun-version"
+    end
+
+  private
+
+    ##
+    # Abtracts command execution plumbing
+    #
+    # &block is expected to return a nailgun command that can be executed in a
+    # system subcall.
+
+    def self.execute_command(config={}, &block)
+      server_address = Nailgun::NailgunConfig.options[:server_address] if config[:server_address].nil?
+      port_no = Nailgun::NailgunConfig.options[:port_no] if config[:port_no].nil?
+
+      command = yield port_no, server_address
+      system(command)
+    end
+
   end
-		JAVAPATH = Nailgun::NailgunConfig.options[:java_bin]
-		NGJAR = File.expand_path(File.join(File.dirname(__FILE__), 'java','jar','nailgun-0.7.1.jar'))
-
-		def self.start_server(port_no="",server_address="")
-			server_address = Nailgun::NailgunConfig.options[:server_address] if server_address.empty?
-			port_no  = Nailgun::NailgunConfig.options[:port_no] if port_no.empty?
-			arguments = "#{server_address}:#{port_no}"
-			command= "nohup #{JAVAPATH} -jar #{NGJAR} #{arguments} > /dev/null 2>&1 &"
-		# puts command
-			system(command)
-		end
-
-		def self.stop_server(port_no="",server_address="")
-			server_address = Nailgun::NailgunConfig.options[:server_address] if server_address.empty?
-			port_no  = Nailgun::NailgunConfig.options[:port_no] if port_no.empty?
-			command ="#{NGPATH} --nailgun-port #{port_no} --nailgun-server #{server_address} ng-stop"
-		#	puts command
-			system(command)
-		end
-
-		def self.ng_cp(absolute_jar_path,port_no="",server_address="")
-			server_address = Nailgun::NailgunConfig.options[:server_address] if server_address.empty?
-			port_no  = Nailgun::NailgunConfig.options[:port_no] if port_no.empty?
-			command ="#{NGPATH} --nailgun-port #{port_no} --nailgun-server #{server_address} ng-cp #{absolute_jar_path}"
-		#	puts command
-			system(command)
-		end
-		
-		def self.ng_alias(alias_name,class_name,port_no="",server_address="")
-			server_address = Nailgun::NailgunConfig.options[:server_address] if server_address.empty?
-			port_no  = Nailgun::NailgunConfig.options[:port_no] if port_no.empty?
-				command = "#{NGPATH} --nailgun-port #{port_no} --nailgun-server #{server_address} ng-alias #{alias_name} #{class_name}"
- 		#puts command
-			system(command)
-		end
-
-		def self.ng_version
-			command = "#{NGPATH} --nailgun-version"
-		#	puts command
-			system(command)
-		end
-	end
 end

data/nailgun.gemspec

@@ -3,7 +3,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "nailgun"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Amar Daxini"]
   s.email       = ["amardaxini@gmail.com"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nailgun
 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: 2012-05-10 00:00:00.000000000 Z
+date: 2012-07-09 00:00:00.000000000 Z
 dependencies: []
 description: XHTML to PDF using Flying Saucer java library
 email: