warbler 1.4.2 → 1.4.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: a4464dec04874d3dce2dd2ffd5b4c5ee82a0d475
+  data.tar.gz: cb9ea2082c156117e3990ac48012c9db695c379a
+SHA512:
+  metadata.gz: 64e0e83ebff4d7b073f90009ce1c47627fbea84799919f7842ba03b1fe91dcd5d9d331506dc7bb0838dd0f09b39bac3bfec4868bec084730fc83e8befa88aca9
+  data.tar.gz: 784b4e947ec1c06ec230f15d5cc566d33dc964a99c417c5d417f5a43af5c0f97f753a55b3b0b8b3715ac5c0505ea43cb98cb6d31823a78068b6cc3b0f1b5046e

data/.travis.yml

@@ -10,7 +10,7 @@ matrix:
   include:
     - rvm: jruby-head
       env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
-    - rvm: jruby-1.7.9
+    - rvm: jruby-1.7.12
       env: JRUBY_OPTS="--server -Xcext.enabled=false -Xcompile.invokedynamic=false"
     - rvm: 1.8.7
       env: ''

data/Gemfile

@@ -6,6 +6,7 @@ group :development do
   gem "jruby-openssl", :platform => :jruby
   gem "rcov", ">= 0.9.8", :platform => :mri_18
   gem "childprocess", :platform => :mri
+  gem "maven-tools", "~> 0.34.5"
 end
 
 if RUBY_VERSION < "1.9"

data/History.txt

@@ -1,3 +1,11 @@
+== 1.4.3
+- Fixed a bug w/ symlinks that was introduced around jruby-1.7.10
+- #258: Bytecode version option for compiled class files
+- #259: Update README.rdoc to not require warbler in Gemfile
+- #260: Can't convert TrueClass into String
+- #167: Excluding rb and class files when using compiled flag
+- #254: Fixes #167 by excluding config.excludes from compiled files
+
 == 1.4.2
 - #241: jars from jruby.jar itself do not get copied over to WEB-INF/lib
 - #199: javascript_include_tag and stylesheet_link_tag not generating digestions

data/README.rdoc

@@ -226,7 +226,7 @@ simply add the following code somewhere in the +Rakefile+ :
 If you're using Bundler, you'll want to add Warbler to your +Gemfile+ :
 
     group :development do
-      gem "warbler"
+      gem "warbler", :require => false
     end
 
 Now you should be able to invoke <tt>rake war</tt> to create your war file.

data/integration/pom.xml

@@ -18,9 +18,9 @@
   <properties>
     <version.jruby-maven-plugins>1.0.0-rc</version.jruby-maven-plugins>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <jruby.version>1.7.9</jruby.version>
+    <jruby.version>1.7.12</jruby.version>
     <!-- prereleased gems ARE snapshots -->
-    <warbler.version>1.4.1.dev-SNAPSHOT</warbler.version>
+    <warbler.version>1.4.3-SNAPSHOT</warbler.version>
     <gem.home>${session.executionRootDirectory}/target/rubygems</gem.home>
     <gem.path>${session.executionRootDirectory}/target/rubygems</gem.path>
   </properties>

data/lib/warbler/config.rb

@@ -130,6 +130,10 @@ module Warbler
     # Defaults to true
     attr_accessor :override_gem_home
 
+    # Explicit bytecode version for compiled ruby files. If given bytecode version is
+    # specified when ruby files are compiled using jrubyc
+    attr_accessor :bytecode_version
+
     # Extra configuration for web.xml. Controls how the dynamically-generated web.xml
     # file is generated.
     #

data/lib/warbler/jar.rb

@@ -40,8 +40,9 @@ module Warbler
       # option to configure what gets compiled?
       return if config.compiled_ruby_files.nil? || config.compiled_ruby_files.empty?
 
-      run_javac(config, config.compiled_ruby_files)
-      replace_compiled_ruby_files(config, config.compiled_ruby_files)
+      compiled_ruby_files = config.compiled_ruby_files - config.excludes.to_a
+      run_javac(config, compiled_ruby_files)
+      replace_compiled_ruby_files(config, compiled_ruby_files)
     end
 
     def run_javac(config, compiled_ruby_files)
@@ -51,7 +52,7 @@ module Warbler
         compat_version = ''
       end
       # Need to use the version of JRuby in the application to compile it
-      javac_cmd = %Q{java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} org.jruby.Main #{compat_version} -S jrubyc \"#{compiled_ruby_files.join('" "')}\"}
+      javac_cmd = %Q{java -classpath #{config.java_libs.join(File::PATH_SEPARATOR)} #{java_version(config)} org.jruby.Main #{compat_version} -S jrubyc \"#{compiled_ruby_files.join('" "')}\"}
       if which('env')
         system %Q{env -i #{javac_cmd}}
       else
@@ -59,6 +60,10 @@ module Warbler
       end
       raise "Compile failed" if $?.exitstatus > 0
     end
+    
+    def java_version(config)
+      config.bytecode_version ? "-Djava.specification.version=#{config.bytecode_version}" : ''
+    end
 
     def replace_compiled_ruby_files(config, compiled_ruby_files)
       # Exclude the rb files and recreate them. This
@@ -155,7 +160,7 @@ module Warbler
       end.each do |d|
         @files[apply_pathmaps(config, d, :application)] = nil
       end
-      @app_filelist = FileList[*(config.dirs.map{|d| "#{d}/**/*"})]
+      @app_filelist = FileList[*(config.dirs.map{|d| %W{#{d}/**/*/**/* #{d}/*}}.flatten)]
       @app_filelist.include *(config.includes.to_a)
       @app_filelist.exclude *(config.excludes.to_a)
       @app_filelist.map {|f| add_with_pathmaps(config, f, :application) }

data/lib/warbler/templates/jbundler.erb

@@ -1,2 +1,2 @@
 # the jars are already loaded via the servlet classloader
-ENV['JBUNDLE_SKIP'] = true
+ENV['JBUNDLE_SKIP'] = 'true'

data/lib/warbler/version.rb

@@ -6,5 +6,5 @@
 #++
 
 module Warbler
-  VERSION = "1.4.2"
+  VERSION = "1.4.3"
 end

data/pom.xml

@@ -4,7 +4,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>rubygems</groupId>
   <artifactId>warbler</artifactId>
-  <version>1.4.1.dev-SNAPSHOT</version>
+  <version>1.4.3-SNAPSHOT</version>
   <packaging>gem</packaging>
   <name>Warbler chirpily constructs .war files of your Rails applications.</name>
   <description>Warbler is a gem to make a Java jar or war file out of any Ruby,

data/spec/warbler/jar_spec.rb

@@ -167,6 +167,15 @@ describe Warbler::Jar do
         file_list(%r{^sample_jar/lib$}).should be_empty
         file_list(%r{^sample_jar/bin$}).should_not be_empty
       end
+
+      it "excludes .rb and .class files from compile" do
+        config.compiled_ruby_files = %w(lib/sample_jar.rb)
+        config.excludes += FileList["lib/sample_jar.*"]
+        jar.compile(config)
+        jar.apply(config)
+        file_list(%r{^sample_jar/lib/sample_jar\.class$}).should be_empty
+        jar.contents('sample_jar/lib/sample_jar.rb').should_not =~ /load __FILE__\.sub/
+      end
     end
 
     context "with a gemspec without a default executable" do

data/spec/warbler/jbundler_spec.rb

@@ -54,7 +54,7 @@ describe Warbler::Jar, "with JBundler" do
     it "adds JBUNDLE_SKIP to init.rb" do
       jar.add_init_file(config)
       contents = jar.contents('META-INF/init.rb')
-      contents.should =~ /ENV\['JBUNDLE_SKIP'\]/
+      contents.should =~ /ENV\['JBUNDLE_SKIP'\] = 'true'/
     end
 
     it "uses ENV['JBUNDLE_JARFILE'] if set" do

data/spec/warbler/task_spec.rb

@@ -125,6 +125,25 @@ describe Warbler::Task do
     end
   end
 
+  it "should allow bytecode version in config" do
+    config.features << "compiled"
+    config.bytecode_version = '1.6'
+    silence { run_task "warble" }
+
+    java_class_magic_number = [0xCA,0xFE,0xBA,0xBE].map { |magic_char| magic_char.chr }.join
+    # 0x32 is version 50, i.e. Java6
+    java6_version_bytes = [0x00,0x32].map { |magic_char| magic_char.chr }.join
+
+    Warbler::ZipSupport.open("#{config.jar_name}.war") do |zf|
+      class_file_bytes = zf.get_input_stream('WEB-INF/lib/ruby_one_nine.class') {|io| io.read }
+      java_class_header     = class_file_bytes[0..3]
+      bytecode_version      = class_file_bytes[6..7]
+      
+      java_class_header.should == java_class_magic_number
+      bytecode_version.should == java6_version_bytes
+    end
+  end
+
   it "should delete .class files after finishing the jar" do
     config.features << "compiled"
     silence { run_task "warble" }

data/warble.rb

@@ -88,6 +88,9 @@ Warbler::Config.new do |config|
   # files will be compiled. Default is to compile all \.rb files in
   # the application.
   # config.compiled_ruby_files = FileList['app/**/*.rb']
+  
+  # When set it specify the bytecode version for compiled class files
+  # config.bytecode_version = "1.6"
 
   # When set to true, Warbler will override the value of ENV['GEM_HOME'] even it
   # has already been set. When set to false it will use any existing value of

metadata

@@ -1,163 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: warbler
 version: !ruby/object:Gem::Version
-  version: 1.4.2
-  prerelease: 
+  version: 1.4.3
 platform: ruby
 authors:
 - Nick Sieger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 0.9.6
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-jars
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.5.6
     - - <
       - !ruby/object:Gem::Version
         version: '2.0'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jruby-rack
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
     - - <
       - !ruby/object:Gem::Version
         version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0.9'
     - - <
       - !ruby/object:Gem::Version
         version: '1.1'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: jbundler
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.5.5
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: ruby-maven
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 3.1.1.0
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.10'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.2
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 2.4.2
-description: ! 'Warbler is a gem to make a Java jar or war file out of any Ruby,
-
+  prerelease: false
+  type: :development
+description: |-
+  Warbler is a gem to make a Java jar or war file out of any Ruby,
   Rails, Merb, or Rack application. Warbler provides a minimal,
-
   flexible, Ruby-like way to bundle up all of your application files for
-
-  deployment to a Java environment.'
+  deployment to a Java environment.
 email: nick@nicksieger.com
 executables:
 - warble
@@ -384,7 +365,8 @@ files:
 homepage: http://caldersphere.rubyforge.org/warbler
 licenses:
 - MIT
-post_install_message: 
+metadata: {}
+post_install_message:
 rdoc_options:
 - --main
 - README.rdoc
@@ -394,22 +376,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: caldersphere
-rubygems_version: 1.8.28
-signing_key: 
-specification_version: 3
+rubygems_version: 2.2.2
+signing_key:
+specification_version: 4
 summary: Warbler chirpily constructs .war files of your Rails applications.
 test_files:
 - integration/Rakefile