puck 1.0.0.pre0 → 1.0.0.pre1

data/bin/puck

@@ -1,7 +1,5 @@
 #!/usr/bin/env ruby
 
-$: << File.expand_path('../../lib', __FILE__)
-
 require 'puck'
 
 

data/lib/puck/configuration.rb

@@ -19,26 +19,33 @@ module Puck
 
     private
 
-    def command_line_options
-      options = {}
+    SCALAR_ARGS = [:app_name, :app_dir, :build_dir, :jruby_complete].freeze
+    LIST_ARGS = [:extra_files].freeze
+    ARG_PREFIX = '--'.freeze
 
+    def command_line_options
       state = nil
-
-      until @argv.empty?
-        arg = @argv.shift
-        case arg
-        when '--extra-files'
-          state = :extra_files
-          options[:extra_files] ||= []
+      option = nil
+      @argv.each_with_object({}) do |arg, options|
+        if arg.start_with?(ARG_PREFIX)
+          option = arg.sub(/^--/, '').gsub('-', '_').to_sym
+          if LIST_ARGS.include?(option)
+            options[option] = []
+            state = :list
+          else
+            state = :scalar
+          end
         else
           case state
-          when :extra_files
-            options[:extra_files] << arg
+          when :list
+            options[option] << arg
+          when :scalar
+            options[option] = arg
+            option = nil
+            state = nil
           end
         end
       end
-
-      options
     end
   end
 end

data/lib/puck/jar.rb

@@ -6,18 +6,21 @@ require 'pathname'
 require 'set'
 require 'ant'
 require 'bundler'
-require 'jruby-jars'
 require 'puck/version'
 
+begin
+  require 'jruby-jars'
+rescue LoadError
+end
 
 module Puck
   class Jar
     def initialize(configuration={})
       @configuration = configuration.dup
-      @configuration[:base_dir] ||= Dir.pwd
-      @configuration[:project_name] ||= File.basename(@configuration[:base_dir])
-      @configuration[:build_dir] ||= File.join(@configuration[:base_dir], 'build')
-      @configuration[:jar_name] ||= @configuration[:project_name] + '.jar'
+      @configuration[:app_dir] ||= Dir.pwd
+      @configuration[:app_name] ||= File.basename(@configuration[:app_dir])
+      @configuration[:build_dir] ||= File.join(@configuration[:app_dir], 'build')
+      @configuration[:jar_name] ||= @configuration[:app_name] + '.jar'
     end
 
     def create!
@@ -25,8 +28,14 @@ module Puck
 
       Dir.mktmpdir do |tmp_dir|
         output_path = File.join(@configuration[:build_dir], @configuration[:jar_name])
-        project_dir = Pathname.new(@configuration[:base_dir])
+        project_dir = Pathname.new(@configuration[:app_dir])
         extra_files = @configuration[:extra_files] || []
+        jruby_complete_path = @configuration[:jruby_complete]
+
+        if !(defined? JRubyJars) && !(jruby_complete_path && File.exists?(jruby_complete_path))
+          raise ArgumentError, 'Cannot build Jar: jruby-jars must be installed, or :jruby_complete must be specified'
+        end
+
         gem_dependencies = resolve_gem_dependencies
         create_jar_bootstrap!(tmp_dir, gem_dependencies)
 
@@ -38,8 +47,13 @@ module Puck
           end
 
           zipfileset dir: tmp_dir, includes: 'jar-bootstrap.rb'
-          zipfileset src: JRubyJars.core_jar_path
-          zipfileset src: JRubyJars.stdlib_jar_path
+
+          if jruby_complete_path
+            zipfileset src: jruby_complete_path
+          else
+            zipfileset src: JRubyJars.core_jar_path
+            zipfileset src: JRubyJars.stdlib_jar_path
+          end
 
           %w[bin lib].each do |sub_dir|
             zipfileset dir: project_dir + sub_dir, prefix: "META-INF/app.home/#{sub_dir}"
@@ -70,8 +84,7 @@ module Puck
           gemspec_path = File.join(ENV['GEM_HOME'], 'bundler', 'gems', "#{bundler_spec.name}-#{revision[0, 12]}", "#{bundler_spec.name}.gemspec")
           base_path = File.dirname(gemspec_path)
         else
-          platform_ext = bundler_spec.platform == 'ruby' ? '' : "-#{bundler_spec.platform}"
-          gemspec_path = File.join(ENV['GEM_HOME'], 'specifications', "#{bundler_spec.full_name}#{platform_ext}.gemspec")
+          gemspec_path = File.join(ENV['GEM_HOME'], 'specifications', "#{bundler_spec.full_name}.gemspec")
           base_path = File.join(ENV['GEM_HOME'], 'gems', bundler_spec.full_name)
         end
         if File.exists?(gemspec_path)

data/lib/puck/version.rb

@@ -1,5 +1,5 @@
 # encoding: utf-8
 
 module Puck
-  VERSION = '1.0.0.pre0'.freeze
+  VERSION = '1.0.0.pre1'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puck
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre0
+  version: 1.0.0.pre1
   prerelease: 6
 platform: ruby
 authors:
@@ -9,28 +9,13 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-18 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: jruby-jars
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.3
-    none: false
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 1.7.3
-    none: false
-  prerelease: false
-  type: :runtime
+date: 2013-07-19 00:00:00.000000000 Z
+dependencies: []
 description: Puck takes your app and packs it along with all your gems and a complete JRuby runtime in a standalone Jar file that can be run with just `java -jar …`
 email:
 - theo@iconara.net
-executables: []
+executables:
+- puck
 extensions: []
 extra_rdoc_files: []
 files:
@@ -41,7 +26,8 @@ files:
 - lib/puck/version.rb
 - bin/puck
 homepage: http://github.com/iconara/puck
-licenses: []
+licenses:
+- Apache License 2.0
 post_install_message:
 rdoc_options: []
 require_paths: