sinicum-runner 0.5.0.pre3 → 0.5.0.pre4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 632962e202c55c3795c441042d651d89aa1870b5
-  data.tar.gz: 63a0d755885dbc57655bf2a99e73c73a75508118
+  metadata.gz: a05c2535dfe8ca1e64b49c453c294f09936e896e
+  data.tar.gz: 03d1ce4591bf7202bbff103b5fe6194317810f3d
 SHA512:
-  metadata.gz: 4bb5c52e6f3459a65fa78b657fdab5d05bf2610c6aca029a0b44e087e7740c29b697550c6668ec82e72aaa1452a44387ab1edfab6ba1d56106f5179a4ae8b6ca
-  data.tar.gz: 07ddafcacf41a2cefcf5a23029f885328bb7b1f2cabb7586e315fb0ab94bacb703037a468f5d6c1e1f7a438abb7563d7e7f2c62c3c763ae71bb3730c44fa1905
+  metadata.gz: 4164b3e4ffbae6705f86d3bba69a24a7d19c6ddf357285a6c1e13084ce3ed4741ecf7afbc95f42e69378ecd190ece75d7b8917ed835894ab5bf896d799dd15ea
+  data.tar.gz: db60d95b9cfb04404763d486248a69535cac7bdd31220ff271644e7a2771d363d81941c46f753043e897cd66d6c31de7b663cce910df7f9efbdaed43f3320fb8

data/.gitignore

@@ -19,3 +19,4 @@ tmp
 # Maven
 /target
 /dependency-reduced-pom.xml
+/lib/java

data/.rspec

@@ -0,0 +1 @@
+--color

data/.travis.yml

@@ -0,0 +1,3 @@
+language: ruby
+rvm:
+  - 2.1.1

data/README.md

@@ -1,3 +1,5 @@
+[![Build Status](https://travis-ci.org/dievision/sinicum-runner.svg?branch=pm-environments)](https://travis-ci.org/dievision/sinicum-runner)
+
 # Sinicum::Runner
 
 Sinicum-runner is a simple embedded Tomcat server, which runs Magnolia CMS from
 the app’s root directory.

data/Rakefile

@@ -1 +1,13 @@
 require "bundler/gem_tasks"
+
+require 'rspec/core/rake_task'
+
+Dir[File.expand_path('../lib/tasks/**/*rake', __FILE__)].each do |file|
+  load file
+end
+
+desc "Runs the tests"
+RSpec::Core::RakeTask.new(:spec)
+
+task default: [:spec, :maven_test]
+task :build => :maven_package

data/lib/sinicum-runner/runner_cli.rb

@@ -4,6 +4,8 @@ require 'optparse'
 module Sinicum
   module Runner
     class RunnerCli
+      SINICUM_ENV_NAME = "SINICUM_ENV"
+      WEBAPP_BASE_DIR = File.join(FileUtils.pwd, "tmp", "magnolia")
       RUNNER_TMP_DIR = ".sinicum-runner"
 
       def run(args)
@@ -37,7 +39,8 @@ module Sinicum
       def build_webapp
         current_dir = FileUtils.pwd
         FileUtils.cd(magnolia_module_dir)
-        run_command("mvn -Dmaven.test.skip=true clean package war:exploded")
+        run_command("#{SINICUM_ENV_NAME}=#{@options.environment} " +
+          "mvn -Dmaven.test.skip=true clean package war:exploded")
       ensure
         FileUtils.cd(current_dir)
       end
@@ -48,7 +51,8 @@ module Sinicum
         options.concat(["-jar", jar_location, "--basedir", runner_dir,
             "--appbase", webapp_directory_path])
         options.concat(@options.to_option_args)
-        ret_value = system("java", *options)
+        ret_value = system({ SINICUM_ENV_NAME => @options.environment }, "java", *options)
+        puts ""
         exit 1 unless ret_value
         ret_value
       end
@@ -81,7 +85,7 @@ module Sinicum
       end
 
       def webapp_directory_path
-        "#{magnolia_module_dir}/target/#{magnolia_module_name}-#{magnolia_module_version}"
+        File.join(WEBAPP_BASE_DIR, @options.environment, @options.environment)
       end
 
       def magnolia_module_name
@@ -144,10 +148,11 @@ module Sinicum
     end
 
     class Options
-      attr_reader :port, :ajp_port, :context, :skip_build, :only_build, :hostname
+      DEFAULT_ENVIRONMENT = "development"
+      attr_reader :port, :ajp_port, :context, :skip_build, :only_build, :hostname, :environment
 
       def initialize(args = [])
-        opts = OptionParser.new do |opts|
+        options = OptionParser.new do |opts|
           opts.on("-p", "--port [PORT]", "HTTP port to bind to") do |port|
             @port = port
           end
@@ -168,11 +173,16 @@ module Sinicum
           opts.on("-b", "--only-build", "only builds the Maven project") do |skip|
             @only_build = true
           end
+          @environment = DEFAULT_ENVIRONMENT
+          opts.on("-e", "--environment [ENVIRONMENT]",
+            "name of the Magnolia environment") do |environment|
+            @environment = environment
+          end
           opts.on("-J[PARAM]", "JVM parameter") do |parameter|
             jvm_params << parameter
           end
         end
-        opts.parse!(args)
+        options.parse!(args)
       end
 
       def jvm_params

data/lib/sinicum-runner/version.rb

@@ -1,5 +1,5 @@
 module Sinicum
   module Runner
-    VERSION = "0.5.0.pre3"
+    VERSION = "0.5.0.pre4"
   end
 end

data/lib/tasks/maven.rake

@@ -0,0 +1,19 @@
+desc "Run the Maven tests"
+task :maven_test do
+  run_or_exit("mvn verify")
+end
+
+desc "Create the Jars"
+task :maven_package do
+  run_or_exit("mvn clean verify")
+end
+
+private
+
+def run_or_exit(command)
+  result = system(command)
+  unless result
+    $stderr.puts "Error executing Maven test, exiting."
+    exit($?.exitstatus)
+  end
+end

data/pom.xml

@@ -4,14 +4,14 @@
 
   <groupId>com.dievision.sinicum</groupId>
   <artifactId>sinicum-runner</artifactId>
-  <version>0.5.0.pre3</version>
+  <version>0.5.0.pre4</version>
   <packaging>jar</packaging>
 
   <name>sinicum-runner</name>
   <url>http://maven.apache.org</url>
 
   <properties>
-    <tomcatVersion>7.0.53</tomcatVersion>
+    <tomcatVersion>7.0.54</tomcatVersion>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
   </properties>
 

data/sinicum-runner.gemspec

@@ -14,7 +14,11 @@ Gem::Specification.new do |gem|
   gem.license       = "MIT/Apache-2.0"
 
   gem.files         = `git ls-files`.split($/)
+  gem.files         += Dir['lib/java/**/*.jar']
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ["lib"]
+
+  gem.add_development_dependency 'rake', '> 10.3'
+  gem.add_development_dependency 'rspec', '~> 3.0'
 end

data/spec/sinicum-runner/runner_cli_spec.rb

@@ -5,57 +5,67 @@ module Sinicum
     describe Options do
       it "should work without options" do
         opts = Options.new([])
-        opts.should_not be nil
+        expect(opts).not_to be nil
       end
 
       it "shoud parse the port" do
         opts = Options.new(["-p", "8090"])
-        opts.port.should eq("8090")
+        expect(opts.port).to eq("8090")
       end
 
       it "should parse the AJP port" do
         opts = Options.new(["-a", "8009"])
-        opts.ajp_port.should eq("8009")
+        expect(opts.ajp_port).to eq("8009")
       end
 
       it "should parse the context path" do
         opts = Options.new(["-c", "some_context"])
-        opts.context.should eq("some_context")
+        expect(opts.context).to eq("some_context")
       end
 
       it "should allow for multiple JVM args" do
         opts = Options.new(["-JXmx256m", "-JXmn256m"])
-        opts.jvm_params.should eq(["Xmx256m", "Xmn256m"])
+        expect(opts.jvm_params).to eq(["Xmx256m", "Xmn256m"])
       end
 
       it "should use Xmx512m as JVM option by default" do
         opts = Options.new
-        opts.to_jvm_options.should eq(["-Xmx512m"])
+        expect(opts.to_jvm_options).to eq(["-Xmx512m"])
       end
 
       it "should use other JVM options if any JVM arguments are given" do
         opts = Options.new(["-J-Xmn256m", "-J-XX:MaxPermSize=256m"])
-        opts.to_jvm_options.should eq(["-Xmn256m", "-XX:MaxPermSize=256m"])
+        expect(opts.to_jvm_options).to eq(["-Xmn256m", "-XX:MaxPermSize=256m"])
       end
 
       it "should not skip the build by default" do
         opts = Options.new
-        opts.skip_build.should be false
+        expect(opts.skip_build).to be false
       end
 
       it "should skip the build if asked to do so" do
         opts = Options.new(["-s"])
-        opts.skip_build.should be true
+        expect(opts.skip_build).to be true
       end
 
       it "should not skip the server by default" do
         opts = Options.new
-        opts.only_build.should be false
+        expect(opts.only_build).to be false
       end
 
       it "should skip the server if asked to do so" do
         opts = Options.new(["-b"])
-        opts.only_build.should be true
+        expect(opts.only_build).to be true
+      end
+
+      it "should have the 'development' environment per default" do
+        opts = Options.new
+        expect(opts.environment).to eq 'development'
+      end
+
+      it "should be possible to set different environments" do
+        opts = Options.new(['-e', 'author'])
+        expect(opts.environment).to eq 'author'
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sinicum-runner
 version: !ruby/object:Gem::Version
-  version: 0.5.0.pre3
+  version: 0.5.0.pre4
 platform: ruby
 authors:
 - Patrik Metzmacher
@@ -9,8 +9,36 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-23 00:00:00.000000000 Z
-dependencies: []
+date: 2014-07-29 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '10.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 description: A gem to easily run Magnolia CMS in a Tomcat instance
 email:
 - sinicum@dievision.de
@@ -20,6 +48,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -28,21 +58,22 @@ files:
 - lib/java/lib/ecj-P20140317-1600.jar
 - lib/java/lib/hamcrest-core-1.3.jar
 - lib/java/lib/jcommander-1.30.jar
-- lib/java/lib/tomcat-annotations-api-7.0.53.jar
-- lib/java/lib/tomcat-api-7.0.53.jar
-- lib/java/lib/tomcat-catalina-7.0.53.jar
-- lib/java/lib/tomcat-el-api-7.0.53.jar
-- lib/java/lib/tomcat-embed-core-7.0.53.jar
-- lib/java/lib/tomcat-jasper-7.0.53.jar
-- lib/java/lib/tomcat-jasper-el-7.0.53.jar
-- lib/java/lib/tomcat-jsp-api-7.0.53.jar
-- lib/java/lib/tomcat-juli-7.0.53.jar
-- lib/java/lib/tomcat-servlet-api-7.0.53.jar
-- lib/java/lib/tomcat-util-7.0.53.jar
-- lib/java/sinicum-runner-0.5.0.pre3.jar
+- lib/java/lib/tomcat-annotations-api-7.0.54.jar
+- lib/java/lib/tomcat-api-7.0.54.jar
+- lib/java/lib/tomcat-catalina-7.0.54.jar
+- lib/java/lib/tomcat-el-api-7.0.54.jar
+- lib/java/lib/tomcat-embed-core-7.0.54.jar
+- lib/java/lib/tomcat-jasper-7.0.54.jar
+- lib/java/lib/tomcat-jasper-el-7.0.54.jar
+- lib/java/lib/tomcat-jsp-api-7.0.54.jar
+- lib/java/lib/tomcat-juli-7.0.54.jar
+- lib/java/lib/tomcat-servlet-api-7.0.54.jar
+- lib/java/lib/tomcat-util-7.0.54.jar
+- lib/java/sinicum-runner-0.5.0.pre4.jar
 - lib/sinicum-runner.rb
 - lib/sinicum-runner/runner_cli.rb
 - lib/sinicum-runner/version.rb
+- lib/tasks/maven.rake
 - pom.xml
 - sinicum-runner.gemspec
 - spec/sinicum-runner/runner_cli_spec.rb
@@ -75,4 +106,3 @@ specification_version: 4
 summary: Simple embedded Tomcat server
 test_files:
 - spec/sinicum-runner/runner_cli_spec.rb
-has_rdoc: