marmottawrapper 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ab551c3416a281241e942fbfbf3d2bfb1d7689e
-  data.tar.gz: debc2199615e70f3a0ef97bb687231f52cae6127
+  metadata.gz: 48644a9a81da54e2dc29ab534bf662ea620bce38
+  data.tar.gz: 8bd2be3debd7eee2165524231fec03812529524d
 SHA512:
-  metadata.gz: 18253cd1ed816e0b33c01f8918b32b24b8f09eba56291cd07f71e1dee24deac67e847a8bbcce2a7ae8022b00ff8c8e00f19e59550f48e10b2c85b15e18117cfe
-  data.tar.gz: 971177a4d6076c638413019bd0732e7cf8b014c5029fc4efc421d5f7327775ffba3a57e324535f208f72f23315b51b495330e0927971382373a5b3d0b9aa5970
+  metadata.gz: 4bc65cb8b5fe2795ab99679ff3f5504c60e1efe334fb406a9cc51dd3a0d2ae9ba545642a245ae4f41c0aac4acaa4102b3bd65ebf522376eee1a47fde47a8ba96
+  data.tar.gz: e52d0def019dfc89c11610a738ae1a65511ddb2d2a5eed06eab6fd0354dfa4229d8fc9ab1a912cb9979d002a2ae61b39fddf2a0f2e17483e9874df747ce59f34

data/.gitignore

@@ -1,4 +1,6 @@
 .extract/*
 marmotta/target/*
 Gemfile.lock
-.vagrant
+.vagrant
+*.gem
+tomcat/*

data/README.md

@@ -1,15 +1,33 @@
-marmotta-webapp
+marmottawrapper
 ===============
 
 This project creates rake tasks to easily start up [Apache Marmotta](http://marmotta.apache.org/) in Tomcat 7.
 
 To install:
 
-    git clone https://github.com/dpla/marmotta-webapp
-	cd marmotta-webapp
+    git clone https://github.com/dpla/marmottawrapper
+    cd marmottawrapper
     bundle install
 
+Download and install Marmotta:
+
+    rake marmotta:fetch
+	rake marmotta:install
+
 * To start a Marmotta app in Tomcat 7 on port `8080`: `rake marmotta:start`
+* To stop Tomcat: `rake marmotta:stop`
+
+Use in Rails Projects
+----------------------
+
+A railtie is included to make the tasks available to Rails applications. To use
+the railtie add `marmottawrapper` to your Gemfile and run `bundle install`.
+
+`rake -T` should now reveal that the marmotta tasks are available:
+
+    rake marmotta:fetch
+	rake marmotta:install
+	rake marmotta:start
 
 Virtual Machine
 ---------------
@@ -24,9 +42,8 @@ Marmotta should now be available on your host machine at port `8087`.
 
 TODO:
 -----
-* [ ] Use a runnable/downloadable JAR file: `mvn clean package -Prunnable-war`, `java -jar target/marmotta-webapp-3.2.1-0.0.1-war-exec.jar`
-* [ ] Add task to download JAR, to make this easier to use in projects.
 * [ ] Make Tomcat port configurable.
+* [ ] Make Marmotta configurable.
 * [ ] Wait for Tomcat to start before quitting `start` task.
 
 License: Apache 2.0

data/lib/marmottawrapper/railtie.rb

@@ -0,0 +1,12 @@
+require 'marmottawrapper'
+require 'rails'
+
+module MarmottaWrapper
+  class Railtie < Rails::Railtie
+  	railtie_name :marmottawrapper
+
+  	rake_tasks do
+  	  load "marmottawrapper/tasks/marmottawrapper.rake"
+  	end
+  end
+end

data/lib/marmottawrapper/tasks/marmottawrapper.rake

@@ -1,15 +1,18 @@
 namespace :marmotta do
 
-  desc "remove the marmotta jar and recreate it"
+  desc "remove the Marmotta data directory and recreate it"
   task :clean do
     Marmottawrapper.clean
   end
 
-  desc "rebuild the marmotta jar"
-  task :build do
+  desc "fetch the Marmotta and Tomcat distribution"
+  task :fetch do
+    Marmottawrapper.fetch
+  end
 
-    dir = Marmottawrapper.build
-    puts "Marmotta jar created at #{dir}"
+  desc "Install the Marmotta and Tomcat distribution"
+  task :install do
+    Marmottawrapper.install
   end
 
   desc "Start Marmotta/Tomcat"

data/lib/marmottawrapper/version.rb

@@ -1,3 +1,3 @@
 class Marmottawrapper
-  VERSION = '0.0.4'
+  VERSION = '0.0.5'
 end

data/lib/marmottawrapper.rb

@@ -1,7 +1,9 @@
 require 'fileutils'
-require 'childprocess'
 
 class Marmottawrapper
+
+  require 'marmottawrapper/railtie' if defined?(Rails)
+
   class << self
     def app_root
       return @app_root if @app_root
@@ -9,108 +11,61 @@ class Marmottawrapper
       @app_root ||= '.'
     end
     
+    def url
+      @url ||= defined?(ZIP_URL) ? ZIP_URL : "https://github.com/dpla/marmotta-webapp/releases/download/v0.0.4/tomcat-marmotta.zip"
+    end
+
     def marmotta_dir
       File.join(app_root, 'marmotta')
     end
     
-    def build_dir
-      File.join(marmotta_dir, 'target')
+    def tmp_dir
+      File.join(app_root, 'tmp')
+    end
+
+    def tomcat_dir
+      File.join(app_root, 'tomcat')
     end
 
     def clean
-      system "rm -r #{build_dir}" if File.directory?(build_dir)
-      build
+      system "rm -r #{tomcat_dir}" if File.directory?(tomcat_dir)
+      system "rm -r #{tmp_dir}" if File.directory?(tmp_dir)
+      system "rm -r #{marmotta_dir}" if File.directory?(marmotta_dir)
     end
 
     ##
-    # Build a runnable .jar file for marmotta
-    def build
-      Dir.chdir(marmotta_dir) {
-        system "mvn clean package -Prunnable-war"
+    # Fetch the Tomcat/Marmotta distribution
+    def fetch
+      FileUtils.makedirs(tmp_dir) unless File.directory?(tmp_dir)
+      FileUtils.makedirs(marmotta_dir) unless File.directory?(marmotta_dir)
+      Dir.chdir(tmp_dir) {
+        system "curl -L #{url} -o tomcat-marmotta.zip"
       }
     end
 
+    def install
+      fetch unless File.exists?(File.join(tmp_dir, 'tomcat-marmotta.zip'))
+      system "unzip #{tmp_dir}/tomcat-marmotta.zip"
+      File.delete(File.join(tmp_dir, 'tomcat-marmotta.zip'))
+    end 
+
     ##
-    # Start the Tomcat server with Marmotta on port 8080
+    # Start the Tomcat server with Marmotta 
     def start
-      if pid
-        if is_running?
-          raise("Server is already running with PID #{pid}")
-        else
-          puts "Removing stale PID file at #{pid_path}"
-          File.delete(pid_path)
-        end
-      end
-      
-      Dir.chdir(marmotta_dir) {
-        process.start
-      }
-
-      FileUtils.makedirs(pid_dir) unless File.directory?(pid_dir)
-      File::open(pid_path, 'w') do |f|
-        f.puts "#{process.pid}"
-      end
-
-      process.pid
+      system "#{tomcat_dir}/bin/startup.sh"
     end
     
     ##
     # Stop Tomcat/Marmotta
     def stop
-      raise "No pid found in #{pid_path}" unless pid or @process
-      if @process
-        @process.stop
-      else
-        Process.kill("KILL", pid) rescue nil
-      end
-      
-      begin
-        File.delete(pid_path)
-      rescue
-      end
+      system "#{tomcat_dir}/bin/shutdown.sh"
     end
 
     def restart
       stop
+      sleep 2
       start
     end
 
-    def process
-      @process ||= begin
-                     process = ChildProcess.build('mvn', 'clean', 'tomcat7:run')
-                     # TODO: When use this instead of the above
-                     # java -jar #{build_dir}/marmotta-webapp-3.2.1-0.0.1-war-exec.jar
-                     process.detach = true
-                     process
-                   end
-    end
-
-    def is_running?  
-      begin
-        return Process.getpgid(pid) != -1
-      rescue Errno::ESRCH
-        return false
-      end
-    end
-
-    def pid
-      File.open( pid_path ) { |f| return f.gets.to_i } if File.exist?(pid_path)
-    end
-
-    def pid_path
-      @path = File.join(pid_dir, pid_file)
-    end
-
-    def pid_dir
-      File.expand_path(File.join(app_root, 'tmp', 'pids'))
-    end
-
-    def pid_file
-      'marmotta.pid'
-    end
-
-    def pid_file?
-      File.exist?(pid_path)
-    end
   end
 end

data/marmottawrapper.gemspec

@@ -9,15 +9,13 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Mark Matienzo", "Tom Johnson"]
   s.email       = ["tech@dp.la"]
-  s.homepage    = "https://github.com/dpla/marmotta-webapp"
-  s.summary     = %q{Convenience tasks for working with marmotta from within a ruby project.}
-  s.description = %q{Convenience tasks for working with marmotta from within a ruby project.}
+  s.homepage    = "https://github.com/dpla/marmottawrapper"
+  s.summary     = %q{Convenience tasks for working with Apache Marmotta from within a Ruby project.}
+  s.description = %q{Convenience tasks for working with Apache Marmotta from within a Ruby project.}
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {spec}/*`.split("\n")
   s.require_paths = ["lib"]
   s.license       = 'APACHE 2'
-
-  s.add_dependency 'childprocess'
   
   s.add_dependency 'rake'
   s.add_development_dependency 'pry'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marmottawrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Mark Matienzo
@@ -9,22 +9,8 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-07 00:00:00.000000000 Z
+date: 2014-10-14 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -53,7 +39,8 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: Convenience tasks for working with marmotta from within a ruby project.
+description: Convenience tasks for working with Apache Marmotta from within a Ruby
+  project.
 email:
 - tech@dp.la
 executables: []
@@ -68,30 +55,12 @@ files:
 - Vagrantfile
 - bin/setup
 - lib/marmottawrapper.rb
+- lib/marmottawrapper/railtie.rb
 - lib/marmottawrapper/tasks/marmottawrapper.rake
 - lib/marmottawrapper/version.rb
-- marmotta/pom.xml
-- marmotta/src/main/resources/META-INF/beans.xml
-- marmotta/src/main/resources/config-defaults.properties
-- marmotta/src/main/resources/config-descriptions.properties
-- marmotta/src/main/resources/logback.xml
-- marmotta/src/main/webapp/META-INF/context.xml
-- marmotta/src/main/webapp/META-INF/jetty-web.xml
-- marmotta/src/main/webapp/WEB-INF/jetty-web.xml
-- marmotta/src/main/webapp/WEB-INF/templates/404.ftl
-- marmotta/src/main/webapp/WEB-INF/templates/admin.ftl
-- marmotta/src/main/webapp/WEB-INF/templates/rdfhtml.ftl
-- marmotta/src/main/webapp/WEB-INF/web.xml
-- marmotta/src/main/webapp/index.jsp
-- marmotta/src/test/resources/META-INF/beans.xml
-- marmotta/src/test/resources/WEB-INF/test-web.xml
-- marmotta/src/test/resources/jndi.properties
-- marmotta/src/test/resources/logback.xml
-- marmotta/src/test/resources/test-config.properties
-- marmotta/src/test/resources/verification.xml
+- marmotta/.gitkeep
 - marmottawrapper.gemspec
-- pom.xml
-homepage: https://github.com/dpla/marmotta-webapp
+homepage: https://github.com/dpla/marmottawrapper
 licenses:
 - APACHE 2
 metadata: {}
@@ -114,6 +83,6 @@ rubyforge_project:
 rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
-summary: Convenience tasks for working with marmotta from within a ruby project.
+summary: Convenience tasks for working with Apache Marmotta from within a Ruby project.
 test_files: []
 has_rdoc: