marmottawrapper 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48644a9a81da54e2dc29ab534bf662ea620bce38
-  data.tar.gz: 8bd2be3debd7eee2165524231fec03812529524d
+  metadata.gz: ec0bb85d1d99a22c5d4d1dac464eb1c5a5e9c4ae
+  data.tar.gz: 649d3459d4aa182637bfd9ec6dcff97471ed91a2
 SHA512:
-  metadata.gz: 4bc65cb8b5fe2795ab99679ff3f5504c60e1efe334fb406a9cc51dd3a0d2ae9ba545642a245ae4f41c0aac4acaa4102b3bd65ebf522376eee1a47fde47a8ba96
-  data.tar.gz: e52d0def019dfc89c11610a738ae1a65511ddb2d2a5eed06eab6fd0354dfa4229d8fc9ab1a912cb9979d002a2ae61b39fddf2a0f2e17483e9874df747ce59f34
+  metadata.gz: 8efafa1b20fc70d9b5db3007760d23f218204404a0052d159d0ba8dcdd5efd1fa07d733050e166d1812c0fb00810a822ceb53785d2e6ca3cec06949c49fa76e6
+  data.tar.gz: 124b5971b75c31edfa1c01246e22f7ae61cc0b1000cd2bf582d70f213f039e0294d5a7d079c2a7d82811694846d165938dd0257c29bd646123e40f15c65ab62f

data/.gitignore

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

data/README.md

@@ -17,6 +17,17 @@ Download and install Marmotta:
 * To start a Marmotta app in Tomcat 7 on port `8080`: `rake marmotta:start`
 * To stop Tomcat: `rake marmotta:stop`
 
+
+Configuration
+-------------
+
+By default, Marmotta will create all its necessary files in a `marmotta`
+subdirectory of your application's root once you start it for the first time,
+including sensible defaults for configuration. Configuration changes can be
+made by altering `marmotta/system-config.properties` (see the
+[Marmotta documentation](http://marmotta.apache.org/configuration.html)
+for more details).
+
 Use in Rails Projects
 ----------------------
 
@@ -43,7 +54,7 @@ Marmotta should now be available on your host machine at port `8087`.
 TODO:
 -----
 * [ ] Make Tomcat port configurable.
-* [ ] Make Marmotta configurable.
 * [ ] Wait for Tomcat to start before quitting `start` task.
+* [ ] Add support for Windows.
 
 License: Apache 2.0

data/lib/marmottawrapper.rb

@@ -1,8 +1,12 @@
 require 'fileutils'
+require 'open-uri'
+require 'zlib'
+require 'archive/tar/minitar'
 
 class Marmottawrapper
 
   require 'marmottawrapper/railtie' if defined?(Rails)
+  Dir[File.expand_path(File.join(File.dirname(__FILE__),"marmottawrapper/tasks/*.rake"))].each { |ext| load ext } if defined?(Rake)
 
   class << self
     def app_root
@@ -12,7 +16,7 @@ class Marmottawrapper
     end
     
     def url
-      @url ||= defined?(ZIP_URL) ? ZIP_URL : "https://github.com/dpla/marmotta-webapp/releases/download/v0.0.4/tomcat-marmotta.zip"
+      @url ||= defined?(ZIP_URL) ? ZIP_URL : "https://github.com/dpla/marmottawrapper/releases/download/v0.0.5/tomcat-marmotta.tgz"
     end
 
     def marmotta_dir
@@ -27,44 +31,43 @@ class Marmottawrapper
       File.join(app_root, 'tomcat')
     end
 
+    def tarball
+      File.join(tmp_dir, 'tomcat-marmotta.tgz')
+    end
+
     def clean
-      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)
+      File.delete(tarball)
+      FileUtils.rm_rf(tomcat_dir) if File.directory?(tomcat_dir)
+      FileUtils.rm_rf(marmotta_dir) if File.directory?(marmotta_dir)
     end
 
     ##
     # Fetch the Tomcat/Marmotta distribution
     def fetch
+      File.delete(tarball)
       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"
-      }
+      open(tarball, 'wb') do |tm|
+        tm.write(open(url).read)
+      end
     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'))
+      fetch unless File.exists?(tarball)
+      FileUtils.makedirs(marmotta_dir) unless File.directory?(marmotta_dir)
+      tb = Zlib::GzipReader.new(File.open(tarball, 'rb'))
+      Archive::Tar::Minitar.unpack(tb, app_root.to_path)
     end 
 
     ##
     # Start the Tomcat server with Marmotta 
     def start
-      system "#{tomcat_dir}/bin/startup.sh"
+      system "MARMOTTA_HOME=#{marmotta_dir} #{tomcat_dir}/bin/startup.sh"
     end
     
     ##
     # Stop Tomcat/Marmotta
     def stop
-      system "#{tomcat_dir}/bin/shutdown.sh"
-    end
-
-    def restart
-      stop
-      sleep 2
-      start
+      system "MARMOTTA_HOME=#{marmotta_dir} #{tomcat_dir}/bin/shutdown.sh"
     end
 
   end

data/lib/marmottawrapper/tasks/marmottawrapper.rake

@@ -17,19 +17,19 @@ namespace :marmotta do
 
   desc "Start Marmotta/Tomcat"
   task :start do
-    pid = Marmottawrapper.start
-    puts "Tomcat started with PID #{pid}"
+    Marmottawrapper.start
   end
 
   desc "Stop Marmotta/Tomcat"
   task :stop do
-    pid = Marmottawrapper.stop
-    puts "Tomcat/Marmotta stopped"
+    Marmottawrapper.stop
   end
 
   desc "Restart Marmotta/Tomcat"
   task :restart do
     Marmottawrapper.stop
+    sleep 2
     Marmottawrapper.start
   end
+
 end

data/lib/marmottawrapper/version.rb

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

data/marmottawrapper.gemspec

@@ -18,5 +18,6 @@ Gem::Specification.new do |s|
   s.license       = 'APACHE 2'
   
   s.add_dependency 'rake'
+  s.add_dependency 'archive-tar-minitar'
   s.add_development_dependency 'pry'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: marmottawrapper
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Mark Matienzo
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -25,6 +25,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: archive-tar-minitar
+  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: pry
   requirement: !ruby/object:Gem::Requirement