jettywrapper 1.3.0 → 1.3.1

data/History.txt

@@ -1,3 +1,6 @@
+1.3.1
+  It should use APP_ROOT constant throughout, not APP_ROOT environment variable.
+
 1.2.1
   Fixed :restart task
 

data/jettywrapper.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   s.name        = "jettywrapper"
   s.version     = GEMVERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Bess Sadler"]
-  s.email       = ["bess@stanford.edu"]
+  s.authors     = ["Chris Beer", "Justin Coyne", "Bess Sadler"]
+  s.email       = ["hydra-tech@googlegroups.com"]
   s.homepage    = "https://github.com/projecthydra/jettywrapper"
   s.summary     = %q{Convenience tasks for working with jetty from within a ruby project.}
   s.description = %q{Spin up a jetty instance (e.g., the one at https://github.com/projecthydra/hydra-jetty) and wrap test in it. This lets us run tests against a real copy of solr and fedora.}
@@ -37,6 +37,6 @@ Gem::Specification.new do |s|
                                                 # debug it right now
   
   s.add_development_dependency 'RedCloth'
-  
+
 end
 

data/lib/jettywrapper.rb

@@ -28,27 +28,36 @@ class Jettywrapper
   
   # configure the singleton with some defaults
   def initialize(params = {})
-    if defined?(Rails.root)
-      @base_path = Rails.root
-    else
-      @base_path = "."
-    end
-
+    self.base_path = self.class.app_root
     logger.debug 'Initializing jettywrapper'
   end
+
   
   # Methods inside of the class << self block can be called directly on Jettywrapper, as class methods. 
   # Methods outside the class << self block must be called on Jettywrapper.instance, as instance methods.
   class << self
+
+    def reset_config
+      @app_root = nil
+    end
+
+    def app_root
+      return @app_root if @app_root
+      if defined?(Rails.root)
+        @app_root = Rails.root
+      elsif defined?(APP_ROOT)
+        @app_root = APP_ROOT
+      else
+        @app_root = '.'
+      end
+      @app_root
+    end
     
     def load_config
       if defined? Rails 
         config_name =  Rails.env 
-        app_root = Rails.root
       else 
         config_name =  ENV['environment']
-        app_root = ENV['APP_ROOT']
-        app_root ||= '.'
       end
 
       jetty_file = "#{app_root}/config/jetty.yml"
@@ -276,7 +285,7 @@ class Jettywrapper
      begin
        f = File.new(pid_path,  "w")
      rescue Errno::ENOENT, Errno::EACCES
-       f = File.new(File.join(@base_path,'tmp',pid_file),"w")
+       f = File.new(File.join(base_path,'tmp',pid_file),"w")
      end
      f.puts "#{process.pid}"
      f.close
@@ -363,7 +372,7 @@ class Jettywrapper
 
    # The directory where the pid_file will be written
    def pid_dir
-     File.expand_path(File.join(@base_path,'tmp','pids'))
+     File.expand_path(File.join(base_path,'tmp','pids'))
    end
    
    # Check to see if there is a pid file already

data/lib/jettywrapper/version.rb

@@ -1 +1 @@
-GEMVERSION = "1.3.0"
+GEMVERSION = "1.3.1"

data/spec/lib/jettywrapper_spec.rb

@@ -4,7 +4,6 @@ require 'rubygems'
   describe Jettywrapper do
     
     # JETTY1 = 
-    
     before(:all) do
       @jetty_params = {
         :quiet => false,
@@ -17,6 +16,38 @@ require 'rubygems'
       }
     end
 
+    context "app_root" do
+      subject {Jettywrapper}
+      context "When rails is present" do
+        before do
+          Jettywrapper.reset_config
+          class Rails
+            def self.root
+              'rails_root'
+            end
+          end
+        end
+        after do
+          Object.send(:remove_const, :Rails)
+          Jettywrapper.reset_config
+        end
+        its(:app_root) {should == 'rails_root'}
+      end
+      context "When APP_ROOT is set" do
+        before do
+          APP_ROOT = 'custom_root'
+        end
+        after do
+          Object.send(:remove_const, :APP_ROOT)
+          Jettywrapper.reset_config
+        end
+        its(:app_root) {should == 'custom_root'}
+      end
+      context "otherwise" do
+        its(:app_root) {should == '.'}
+      end
+    end
+
     context "config" do
       it "loads the application jetty.yml first" do
         IO.expects(:read).with('./config/jetty.yml').once.returns("default:\n")

metadata

@@ -1,184 +1,180 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: jettywrapper
-version: !ruby/object:Gem::Version
-  version: 1.3.0
+version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: 
+  segments: 
+  - 1
+  - 3
+  - 1
+  version: 1.3.1
 platform: ruby
-authors:
+authors: 
+- Chris Beer
+- Justin Coyne
 - Bess Sadler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-06 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-07-10 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: logger
-  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: mediashelf-loggable
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  requirement: *id001
+- !ruby/object:Gem::Dependency 
+  name: mediashelf-loggable
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: childprocess
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  requirement: *id002
+- !ruby/object:Gem::Dependency 
+  name: childprocess
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  requirement: *id003
+- !ruby/object:Gem::Dependency 
+  name: i18n
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: 3.0.0
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
+  requirement: *id004
+- !ruby/object:Gem::Dependency 
+  name: activesupport
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 7
+        segments: 
+        - 3
+        - 0
+        - 0
         version: 3.0.0
-- !ruby/object:Gem::Dependency
+  type: :runtime
+  requirement: *id005
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - <
-      - !ruby/object:Gem::Version
-        version: '2.0'
-- !ruby/object:Gem::Dependency
-  name: mocha
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 2
+        - 0
+        version: "2.0"
   type: :development
+  requirement: *id006
+- !ruby/object:Gem::Dependency 
+  name: mocha
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id007
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: yard
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 0.6.5
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  requirement: *id008
+- !ruby/object:Gem::Dependency 
+  name: yard
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 6
+        - 5
         version: 0.6.5
-- !ruby/object:Gem::Dependency
-  name: RedCloth
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
+  requirement: *id009
+- !ruby/object:Gem::Dependency 
+  name: RedCloth
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-description: Spin up a jetty instance (e.g., the one at https://github.com/projecthydra/hydra-jetty)
-  and wrap test in it. This lets us run tests against a real copy of solr and fedora.
-email:
-- bess@stanford.edu
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :development
+  requirement: *id010
+description: Spin up a jetty instance (e.g., the one at https://github.com/projecthydra/hydra-jetty) and wrap test in it. This lets us run tests against a real copy of solr and fedora.
+email: 
+- hydra-tech@googlegroups.com
 executables: []
+
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .gitmodules
 - .rvmrc
@@ -196,31 +192,41 @@ files:
 - spec/lib/jettywrapper_spec.rb
 - spec/spec_helper.rb
 - tasks/jettywrapper.rake
+has_rdoc: true
 homepage: https://github.com/projecthydra/jettywrapper
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-      segments:
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
       - 0
-      hash: 463771772989334870
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 23
+      segments: 
+      - 1
+      - 3
+      - 6
       version: 1.3.6
 requirements: []
+
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Convenience tasks for working with jetty from within a ruby project.
 test_files: []
+