stoor 0.1.11 → 0.1.12

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 560301f4ccc36ac78e8be795a0618f8073bf5d42
+  data.tar.gz: bd30f1099df8ce5625848399670c55c3238e9dc6
+SHA512:
+  metadata.gz: 189c9563b553da8cf8ebb1df74057fd35e79f32162f5ac03acd3773a9050afabc2d10b47561870cc69aa573c29f955d4ac7b693a63c33305d7bb0f9d99b5ab58
+  data.tar.gz: bb374fd1370e6e17de4a3443ed76df7a69c9c2eed30ae823c4115e997464ca11b728d92bc34bd06c6dbae5eec3840bbf510c397ce013cd12c0b15b6f721a958d

data/bin/stoor

@@ -2,14 +2,10 @@
 
 require 'thin'
 
-dirname = File.dirname(__FILE__)
-env_key = dirname.split(File::SEPARATOR).last.upcase
+ENV['STOOR_RUNNING_VIA_CMD'] = 'y'
+ENV['STOOR_WIKI_PATH'] ||= '.'
 
-config_ru = File.expand_path(File.join(dirname, '..', 'config.ru'))
-
-ENV["#{@env_key}_WIKI_PATH"] ||= '.'
-
-ARGV.unshift config_ru
+ARGV.unshift File.expand_path(File.join(File.dirname(__FILE__), '..', 'config.ru'))
 ARGV.unshift '-R'
 ARGV.unshift 'start'
 Thin::Runner.new(ARGV).run!

data/config.ru

@@ -10,17 +10,16 @@ require 'rack/null_logger'
 
 ENV['RACK_ENV'] ||= 'development'
 
-config = Stoor::Config.new(__FILE__)
+config = Stoor::Config.new(__FILE__, ENV['STOOR_RUNNING_VIA_CMD'])
 
 domain       = config.env('DOMAIN') || 'localhost'
 secret       = config.env('SECRET') || 'stoor'
 expire_after = (config.env('EXPIRE_AFTER') || '3600').to_i
 
-
-gollum_path = config.env('WIKI_PATH') || File.expand_path(File.dirname(__FILE__))
+gollum_path = config.env('WIKI_PATH') || config.dirname
 
 config.dump_env
-config.log "gollum_path = #{gollum_path}"
+config.log "gollum_path: #{gollum_path}"
 
 if message = config.repo_missing?(gollum_path)
   puts message

data/lib/stoor/config.rb

@@ -2,8 +2,8 @@ require 'logger'
 
 module Stoor
   class Config
-    def initialize(file)
-      @file = file
+    def initialize(file, running_via_cmd)
+      @file, @running_via_cmd = file, running_via_cmd
     end
 
     def dirname
@@ -15,7 +15,9 @@ module Stoor
     end
 
     def env_prefix
-      @env_prefix ||= dirname.split(File::SEPARATOR).last.upcase
+      @env_prefix ||= begin
+        @running_via_cmd ? 'STOOR' : dirname.split(File::SEPARATOR).last.upcase
+      end
     end
 
     def env(token)

data/lib/stoor/version.rb

@@ -1,3 +1,3 @@
 module Stoor
-  VERSION = '0.1.11'
+  VERSION = '0.1.12'
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: stoor
 version: !ruby/object:Gem::Version
-  version: 0.1.11
-  prerelease: 
+  version: 0.1.12
 platform: ruby
 authors:
 - John G. Norman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-09 00:00:00.000000000 Z
+date: 2014-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thin
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: gollum
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: sinatra_auth_github
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: warden-github
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -78,7 +69,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rack-test
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -86,7 +76,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -94,7 +83,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -102,7 +90,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -146,28 +133,27 @@ files:
 homepage: https://github.com/jgn/stoor
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Front-end for Gollum
 test_files:
 - spec/lib/stoor/git_config_spec.rb
@@ -175,3 +161,4 @@ test_files:
 - spec/lib/stoor/transform_content_spec.rb
 - spec/repo.rb
 - spec/spec_helper.rb
+has_rdoc: