web_app_builder 1.0.2 → 1.0.3

data/Gemfile

@@ -5,6 +5,10 @@ group :default do
   gem "meta_methods"
   gem "file_utils"
   gem "zip_dsl"
+  gem "jruby-jars"
+  gem "jruby-rack"
+  gem "jruby-openssl"
+  gem "bouncy-castle-java"
 end
 
 group :development do

data/Warfile

@@ -0,0 +1,22 @@
+#rails_env = "development"
+rails_env = "production"
+
+ant_home = ENV['ANT_HOME'] || "#{ENV['HOME']}/apache-ant-1.8.3"
+
+project_name = "web_app_builder_test"
+
+#jndi_name = "rails_app_tmpl_#{rails_env}"
+#jndi_resource_name = 'jdbc/rails_app_tmpl'
+
+gems_to_reject = %w(bundler)
+
+groups_to_reject = %w(test)
+groups_to_reject << 'development' unless %w(development staging).include? rails_env.to_sym
+
+author = "Alexander Shvets"
+
+#additional_java_jars = ["#{ENV['DB_DRIVERS_DIR']}/ojdbc6.jar"]
+
+templates_dir = "config/templates"
+
+

data/config/templates/META-INF/context.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Context>
+  <!-- Specify a JDBC datasource -->
+
+  <Resource name="<%= config[:jndi_resource_name] %>"
+            auth="Container"
+            type="javax.sql.DataSource"
+            driverClassName="<%= config[:db_driver_class] %>"
+            url="<%= config[:db_url] %>"
+            username="<%= config[:db_username] %>" password="<%= config[:db_password] %>"
+            maxActive="20" maxIdle="10" maxWait="-1"
+            validationQuery="select dummy from dual"
+          />
+
+  <!--factory="org.apache.tomcat.dbcp.dbcp.BasicDataSourceFactory"-->
+  <!--org.postgresql.Driver-->
+  <!--com.mysql.jdbc.Driver-->
+  <!--oracle.jdbc.OracleDriver-->
+  <!--dbc:oracle:thin:@127.0.0.1:1521:mysid-->
+
+  <!-- Specify the security realm and location of the users file
+  <Realm className="org.apache.catalina.realm.MemoryRealm"
+         pathname="/tomcat/webapps/ROOT/WEB-INF/users.xml" />
+  -->
+</Context>
+

data/config/templates/WEB-INF/jboss-web.xml

@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-web>
+  <resource-ref>
+    <res-ref-name><%= config[:jndi_resource_name] %></res-ref-name>
+    <jndi-name>java:/<%= config[:jndi_name] %></jndi-name>
+    <res-type>javax.sql.DataSource</res-type>
+  </resource-ref>
+</jboss-web>
+

data/config/templates/WEB-INF/web.xml

@@ -0,0 +1,45 @@
+<!DOCTYPE web-app PUBLIC
+        "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd">
+<web-app>
+
+  <context-param>
+    <param-name>public.root</param-name>
+    <param-value>/</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>rails.env</param-name>
+    <param-value><%= config[:rails_env] %></param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>jruby.min.runtimes</param-name>
+    <param-value>10</param-value>
+  </context-param>
+
+  <context-param>
+    <param-name>jruby.max.runtimes</param-name>
+    <param-value>10</param-value>
+  </context-param>
+
+  <filter>
+    <filter-name>RackFilter</filter-name>
+    <filter-class>org.jruby.rack.RackFilter</filter-class>
+  </filter>
+  <filter-mapping>
+    <filter-name>RackFilter</filter-name>
+    <url-pattern>/*</url-pattern>
+  </filter-mapping>
+
+  <listener>
+    <listener-class>org.jruby.rack.rails.RailsServletContextListener</listener-class>
+  </listener>
+
+  <resource-ref>
+    <res-ref-name><%= config[:jndi_resource_name] %></res-ref-name>
+    <res-type>javax.sql.DataSource</res-type>
+    <res-auth>Container</res-auth>
+  </resource-ref>
+
+</web-app>

data/config/templates/postgres-ds.xml

@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<!-- ===================================================================== -->
+<!--                                                                       -->
+<!--  JBoss Server Configuration                                           -->
+<!--                                                                       -->
+<!-- ===================================================================== -->
+
+<!-- See http://www.jboss.org/community/wiki/Multiple1PC for information about local-tx-datasource -->
+<!-- $Id: postgres-ds.xml 97536 2009-12-08 14:05:07Z jesper.pedersen $ -->
+<!-- ==================================================================== -->
+<!--  Datasource config for Postgres                                      -->
+<!-- ==================================================================== -->
+
+
+<datasources>
+  <local-tx-datasource>
+    <jndi-name><%= config[:jndi_name] %></jndi-name>
+    <connection-url><%= config[:db_url] %></connection-url>
+    <driver-class>org.postgresql.Driver</driver-class>
+    <user-name><%= config[:db_username] %></user-name>
+    <password><%= config[:db_password] %></password>
+        <!-- sql to call when connection is created.  Can be anything, select 1 is valid for PostgreSQL
+        <new-connection-sql>select 1</new-connection-sql>
+        -->
+
+        <!-- sql to call on an existing pooled connection when it is obtained from pool.  Can be anything, select 1 is valid for PostgreSQL
+        <check-valid-connection-sql>select 1</check-valid-connection-sql>
+        -->
+
+      <!-- corresponding type-mapping in the standardjbosscmp-jdbc.xml (optional) -->
+      <metadata>
+         <type-mapping>PostgreSQL 9.1.3</type-mapping>
+      </metadata>
+  </local-tx-datasource>
+
+</datasources>

data/lib/web_app_builder/version.rb

@@ -1,3 +1,3 @@
 module WebAppBuilder
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/web_app_builder/web_app_builder.rb

@@ -3,24 +3,21 @@ require 'meta_methods'
 
 require 'file_utils/file_utils'
 require 'zip_dsl/zip_dsl'
+require 'zip_dsl/zip_writer'
 require 'directory_builder'
 
 class WebAppBuilder
   include MetaMethods
   include FileUtils
 
-  JRUBY_JARS_VERSION         = Gem.loaded_specs["jruby-jars"].version
-  JRUBY_RACK_VERSION         = Gem.loaded_specs["jruby-rack"].version
-  JRUBY_OPENSSL_VERSION      = Gem.loaded_specs["jruby-openssl"].version
-  BOUNCY_CASTLE_JAVA_VERSION = Gem.loaded_specs["bouncy-castle-java"].version
-
   WARFILE_NAME = "Warfile"
 
-  attr_reader :basedir, :build_dir, :config
+  attr_reader :build_dir, :basedir, :config
 
-  def initialize basedir, build_dir
-    @basedir = basedir
+  def initialize build_dir, basedir, gemset_name
     @build_dir = build_dir
+    @basedir = File.expand_path(basedir)
+    @gemset_name = gemset_name
   end
 
   def configure
@@ -36,27 +33,14 @@ class WebAppBuilder
   def prepare
     create_directory build_dir
 
-    process_templates
-
-    puts "RAILS_ENV: #{config[:rails_env]}"
+    process_templates "#@basedir/#{config[:templates_dir]}"
   end
 
   def war
     configure
 
     gems = bundler_gems
-
-    # binding
-    build_dir = @build_dir
-    gem_home = gem_home()
-    global_gem_home = global_gem_home()
-    config = @config
-    ruby_home = ruby_home()
-    included_global_gems = included_global_gems()
-    included_global_specs = included_global_specs()
-    included_gems = included_gems(gems)
-    included_specs = included_specs(gems)
-    jars = jars(gems)
+    global_gem_home = global_gem_home(@gemset_name)
 
     manifest = <<-TEXT
 Built-By: web_app_builder
@@ -73,15 +57,18 @@ Created-By: #{config[:author]}
       directory :from_dir => "lib", :to_dir => "WEB-INF/lib", :filter => "*.rb"
       directory :from_dir => "vendor", :to_dir => "WEB-INF/vendor"
 
-      directory :from_dir => "#{gem_home}/gems", :to_dir => "WEB-INF/gems/gems", :filter => included_gems
+      directory :from_dir => "#{gem_home}/gems", :to_dir => "WEB-INF/gems/gems", :filter => included_gems(gems)
       directory :from_dir => "#{gem_home}/specifications", :to_dir => "WEB-INF/gems/specifications",
-                :filter => included_specs
-      directory :from_dir => "#{global_gem_home}/gems", :to_dir => "WEB-INF/gems/gems", :filter => included_global_gems
-      directory :from_dir => "#{global_gem_home}/specifications", :to_dir => "WEB-INF/gems/specifications", :filter => included_global_specs
+                :filter => included_specs(gems)
+      directory :from_dir => "#{global_gem_home}/gems", :to_dir => "WEB-INF/gems/gems",
+      :filter => included_global_gems(gems)
+      directory :from_dir => "#{global_gem_home}/specifications", :to_dir => "WEB-INF/gems/specifications",
+      :filter => included_global_specs(gems)
 
-      directory :from_dir => "#{global_gem_home}/gems/jruby-openssl-#{JRUBY_OPENSSL_VERSION}/lib/shared",
+      directory :from_dir => "#{global_gem_home}/gems/jruby-openssl-#{gem_version(gems, "jruby-openssl")}/lib/shared",
                 :to_dir => "WEB-INF/lib", :filter => "*.jar"
-      directory :from_dir => "#{global_gem_home}/gems/bouncy-castle-java-#{BOUNCY_CASTLE_JAVA_VERSION}/lib",
+      directory :from_dir => "#{global_gem_home}/gems/bouncy-castle-java-#{gem_version(gems,
+                                                                                       "bouncy-castle-java-jars")}/lib",
                 :to_dir => "WEB-INF/lib", :filter => "*.jar"
       directory :from_dir => "#{ruby_home}/lib", :to_dir => "WEB-INF/lib", :filter => "*.jar"
 
@@ -91,15 +78,18 @@ Created-By: #{config[:author]}
 
       directory :to_dir => "WEB-INF/log"
 
-      directory :from_dir => "#{gem_home}/gems/jruby-rack-#{JRUBY_RACK_VERSION}/lib", :to_dir => "WEB-INF/lib", :filter => "*.jar"
-      directory :from_dir => "#{gem_home}/gems/jruby-jars-#{JRUBY_JARS_VERSION}/lib", :to_dir => "WEB-INF/lib", :filter => "*.jar"
+      directory :from_dir => "#{gem_home}/gems/jruby-rack-#{gem_version(gems, "jruby-rack")}/lib",
+                :to_dir => "WEB-INF/lib", :filter => "*.jar"
+      directory :from_dir => "#{gem_home}/gems/jruby-jars-#{gem_version(gems, "jruby-jars")}/lib",
+                :to_dir => "WEB-INF/lib",
+                :filter => "*.jar"
 
-      jars.each do |jar|
+      jars(gems).each do |jar|
         file :name => jar, :to_dir => "WEB-INF/lib"
       end
 
-      file :name => "Gemfile", :to_dir => "WEB-INF"
-      file :name => "Gemfile.lock", :to_dir => "WEB-INF"
+      file :name => "#{basedir}/Gemfile", :to_dir => "WEB-INF"
+      file :name => "#{basedir}/Gemfile.lock", :to_dir => "WEB-INF"
 
       directory :from_dir => "public"
 
@@ -114,19 +104,9 @@ Created-By: #{config[:author]}
 
     gems = bundler_gems
 
-    # binding
-    build_dir = @build_dir
-    gem_home = gem_home()
-    global_gem_home = global_gem_home()
-    config = @config
-    ruby_home = ruby_home()
-    included_global_gems = included_global_gems()
-    included_global_specs = included_global_specs()
-    included_gems = included_gems(gems)
-    included_specs = included_specs(gems)
-    jars = jars(gems)
+    global_gem_home = global_gem_home(@gemset_name)
 
-    builder = DirectoryBuilder.new to_dir
+    builder = DirectoryBuilder.new to_dir, basedir
 
     builder.build do
       directory :from_dir => "#{build_dir}/WEB-INF", :to_dir => "WEB-INF"
@@ -137,13 +117,15 @@ Created-By: #{config[:author]}
       directory :from_dir => "lib", :to_dir => "WEB-INF/lib", :filter => "*.rb"
       directory :from_dir => "vendor", :to_dir => "WEB-INF/vendor"
 
-      directory :from_dir => "#{gem_home}/gems", :to_dir => "WEB-INF/gems/gems", :filter => included_gems
+      directory :from_dir => "#{gem_home}/gems", :to_dir => "WEB-INF/gems/gems", :filter => included_gems(gems)
       directory :from_dir => "#{gem_home}/specifications", :to_dir => "WEB-INF/gems/specifications",
-                :filter => included_specs
-      directory :from_dir => "#{global_gem_home}/gems", :to_dir => "WEB-INF/gems/gems", :filter => included_global_gems
-      directory :from_dir => "#{global_gem_home}/specifications", :to_dir => "WEB-INF/gems/specifications", :filter => included_global_specs
+                :filter => included_specs(gems)
+      directory :from_dir => "#{global_gem_home}/gems", :to_dir => "WEB-INF/gems/gems",
+      :filter => included_global_gems(gems)
+      directory :from_dir => "#{global_gem_home}/specifications", :to_dir => "WEB-INF/gems/specifications",
+      :filter => included_global_specs(gems)
 
-      directory :from_dir => "#{global_gem_home}/gems/jruby-openssl-#{JRUBY_OPENSSL_VERSION}/lib/shared",
+      directory :from_dir => "#{global_gem_home}/gems/jruby-openssl-#{gem_version(gems, "jruby-openssl")}/lib/shared",
                 :to_dir => "WEB-INF/lib", :filter => "*.jar"
       directory :from_dir => "#{global_gem_home}/gems/bouncy-castle-java-#{BOUNCY_CASTLE_JAVA_VERSION}/lib",
                 :to_dir => "WEB-INF/lib", :filter => "*.jar"
@@ -153,54 +135,58 @@ Created-By: #{config[:author]}
         file :name => jar, :to_dir => "WEB-INF/lib"
       end if config[:additional_java_jars]
 
-      #directory :to_dir => "WEB-INF/log"
-
-      directory :from_dir => "#{gem_home}/gems/jruby-rack-#{JRUBY_RACK_VERSION}/lib", :to_dir => "WEB-INF/lib", :filter => "*.jar"
-      directory :from_dir => "#{gem_home}/gems/jruby-jars-#{JRUBY_JARS_VERSION}/lib", :to_dir => "WEB-INF/lib", :filter => "*.jar"
+      directory :from_dir => "#{gem_home}/gems/jruby-rack-#{gem_version(gems, "jruby-rack")}/lib",
+                :to_dir => "WEB-INF/lib", :filter => "*.jar"
+      directory :from_dir => "#{gem_home}/gems/jruby-jars-#{gem_version(gems, "jruby-jars")}/lib",
+                :to_dir => "WEB-INF/lib", :filter => "*.jar"
 
-      jars.each do |jar|
+      jars(gems).each do |jar|
         file :name => jar, :to_dir => "WEB-INF/lib"
       end
 
-      file :name => "Gemfile", :to_dir => "WEB-INF"
-      file :name => "Gemfile.lock", :to_dir => "WEB-INF"
+      file :name => "#{basedir}/Gemfile", :to_dir => "WEB-INF"
+      file :name => "#{basedir}/Gemfile.lock", :to_dir => "WEB-INF"
 
       directory :from_dir => "public"
-
-      #content :name => "MANIFEST.MF", :to_dir => "META-INF", :source => manifest
     end
   end
 
-  def process_templates
+  def process_templates dir
     configure
 
-    process_dir(config[:templates_dir]) do |entry_name|
+    with_dir(dir) do |entry_name|
       if entry_name == "META-INF"
-        process_dir("#{config[:templates_dir]}/META-INF") do |entry_name2|
-          new_content = substitute_vars("#{config[:templates_dir]}/META-INF/#{entry_name2}")
+        with_dir("#{dir}/META-INF") do |entry_name2|
+          new_content = execute_template("#{dir}/META-INF/#{entry_name2}", binding)
 
           create_directory "#{build_dir}/META-INF/"
 
           write_content_to_file new_content, "#{build_dir}/META-INF/#{entry_name2}"
         end
       elsif entry_name == "WEB-INF"
-        process_dir("#{config[:templates_dir]}/WEB-INF") do |entry_name2|
-          new_content = substitute_vars("#{config[:templates_dir]}/WEB-INF/#{entry_name2}")
+        with_dir("#{dir}/WEB-INF") do |entry_name2|
+          new_content = execute_template("#{dir}/WEB-INF/#{entry_name2}", binding)
 
           create_directory "#{build_dir}/WEB-INF/"
 
           write_content_to_file new_content, "#{build_dir}/WEB-INF/#{entry_name2}"
         end
       else
-        new_content = substitute_vars("#{config[:templates_dir]}/#{entry_name}")
+        new_content = execute_template("#{dir}/#{entry_name}", binding)
 
         write_content_to_file new_content, "#{build_dir}/#{entry_name}"
       end
-    end
+    end if File.exist?(dir)
   end
 
   private
 
+  def gem_version gems, name
+    gem = gems.find {|gem| gem.name == name }
+
+    gem.nil? ? nil : gem.version
+  end
+
   def ruby_home
     ENV['MY_RUBY_HOME']
   end
@@ -209,16 +195,19 @@ Created-By: #{config[:author]}
     ENV['GEM_HOME']
   end
 
-  def global_gem_home
-    gem_home.gsub(config[:project_name], 'global')
+  def global_gem_home gemset_name
+    gem_home.gsub(gemset_name, 'global')
   end
 
-  def included_global_gems
-    "jruby-openssl-#{JRUBY_OPENSSL_VERSION}/**/*, bouncy-castle-java-#{BOUNCY_CASTLE_JAVA_VERSION}/**/*"
+  def included_global_gems gems
+    "jruby-openssl-#{gem_version(gems, 'jruby-openssl')}/**/*, bouncy-castle-java-#{gem_version(gems,
+                                                                                                'bouncy-castle-java-jars')}/**/*"
   end
 
-  def included_global_specs
-    "jruby-openssl-#{JRUBY_OPENSSL_VERSION}.gemspec, bouncy-castle-java-#{BOUNCY_CASTLE_JAVA_VERSION}.gemspec"
+  def included_global_specs gems
+    "jruby-openssl-#{gem_version(gems, 'jruby-openssl')}.gemspec, bouncy-castle-java-#{gem_version(gems,
+                                                                                                  'bouncy-castle-java-jars')}
+.gemspec"
   end
 
   def included_gems gems

data/lib/web_app_builder.rb

@@ -1 +1,2 @@
+require 'zip'
 require "web_app_builder/web_app_builder"

data/spec/spec_helper.rb

@@ -0,0 +1 @@
+$: << File.expand_path(File.dirname(__FILE__) + '/../lib')

data/spec/web_app_builder_spec.rb

@@ -0,0 +1,24 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+require 'web_app_builder'
+
+describe WebAppBuilder do
+
+  let(:basedir) { File.expand_path("#{File.dirname(__FILE__)}/..") }
+
+  subject { WebAppBuilder.new("#{basedir}/build", basedir, "web_app_builder") }
+
+  before do
+    subject.clean
+    subject.prepare
+  end
+
+  it "should create new zip file with files at particular folder" do
+    subject.war
+  end
+
+  it "should create new exploded directory with files" do
+    subject.war_exploded
+  end
+
+end

data/web_app_builder.gemspec

@@ -19,6 +19,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "meta_methods", [">= 0"]
   spec.add_runtime_dependency "file_utils", [">= 0"]
   spec.add_runtime_dependency "zip_dsl", [">= 0"]
+  spec.add_runtime_dependency "jruby-jars", [">= 0"]
+  spec.add_runtime_dependency "jruby-rack", [">= 0"]
+  spec.add_runtime_dependency "jruby-openssl", [">= 0"]
+  spec.add_runtime_dependency "bouncy-castle-java", [">= 0"]
   spec.add_development_dependency "gemspec_deps_gen", [">= 0"]
   spec.add_development_dependency "gemcutter", [">= 0"]
   

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: web_app_builder
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-08 00:00:00.000000000 Z
+date: 2012-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -75,6 +75,70 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: jruby-jars
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jruby-rack
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: jruby-openssl
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: bouncy-castle-java
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: gemspec_deps_gen
   requirement: !ruby/object:Gem::Requirement
@@ -131,9 +195,16 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- Warfile
+- config/templates/META-INF/context.xml
+- config/templates/WEB-INF/jboss-web.xml
+- config/templates/WEB-INF/web.xml
+- config/templates/postgres-ds.xml
 - lib/web_app_builder.rb
 - lib/web_app_builder/version.rb
 - lib/web_app_builder/web_app_builder.rb
+- spec/spec_helper.rb
+- spec/web_app_builder_spec.rb
 - web_app_builder.gemspec
 - web_app_builder.gemspec.erb
 homepage: http://github.com/shvets/web_app_builder
@@ -161,4 +232,6 @@ signing_key:
 specification_version: 3
 summary: Class that helps to keep database credentials for rails application in private
   place
-test_files: []
+test_files:
+- spec/spec_helper.rb
+- spec/web_app_builder_spec.rb