omnifiles 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 10d0e6b7d9a8c8ba27681ce9726d63baf309c22e
-  data.tar.gz: 33e13a6d786009124e6312d6a26cd9872fcb50e8
+  metadata.gz: e77c0d22099ad90e4c8b8b911bf02f75772b8863
+  data.tar.gz: a8b8677804088a48c6074f85e648b221db58396a
 SHA512:
-  metadata.gz: cebc8b5441cbd3d053a7d0465e7867a20d96f5894b1d8090f7ad031123a6bc494388e44552e295cc0abc0f0e1323f90268c935e4f98085b64377308158d27d51
-  data.tar.gz: 41f1711c4d30660f493fcec462beca32fabacf7f6827defb1bedaeef147548572bc4ede0e15d8ff9fdc291b36dfb6e67ba36368a36b831e4c9069b9165214dbc
+  metadata.gz: 725524c2140e85489a1f67b12a92576e560e106af6cebc447a4a35984dbd2bdb5565f37f11dfbb6fd4c85c5c8e3dcb0bcf5f23fb93d902d29d4a0acea7a3499b
+  data.tar.gz: 8bfe2cd8971e47799f2bc6d4d556c34916039fd5518cf0328bb0d9542d8672ca8d8da9957040403618416458e6bc445efc61f712517aabca2dc568b407e7975c

data/README.md

@@ -11,7 +11,7 @@ urls and statistics.
 
 ## Installation
 
-OmniFiles is a Rack application and can be used as a gem or as a server in local directory.
+OmniFiles is a Sinatra/Rack application and can be used as a gem or as a server in local directory.
 
 ### As a gem
 
@@ -24,9 +24,13 @@ OmniFiles is a Rack application and can be used as a gem or as a server in local
 3. Start an app as a Thin server
 
         OMNIFILES_SETTINGS=/path/to/settings.yaml omnifiles
-Of course, you can provide any additional Thin options:
+Of course, you can provide any additional Thin options at command line:
 
         OMNIFILES_SETTINGS=/path/to/settings.yaml omnifiles -p 3000
+Or at config file (see Thin documentation):
+
+        OMNIFILES_SETTINGS=/path/to/settings.yaml omnifiles -C /path/to/thin.yaml
+
 
 ## As a rack app
 
@@ -53,10 +57,16 @@ Also specify `-E production` at `omnifiles` (actially Thin) command line.
 
 If you prefer to run omnifiles as a daemon, don't forget to set log and pid location. Author prefer to follow XDG and place all the files at the `~/.local/share/omnifiles`, including the database. So one can use following command line:
 
-    OMNIFILES_SETTINGS=$HOME/.local/share/omnifiles/settings.yaml omnifiles -d -a 127.0.0.1 -p 3000 \
+    OMNIFILES_SETTINGS=$HOME/.local/share/omnifiles/settings.yaml omnifiles start -d -a 127.0.0.1 -p 3000 \
       -l $HOME/.local/share/omnifiles/omnifiles.log \
       -P $HOME/.local/share/omnifiles/omnifiles.pid
 
+Complex Thin options can be hidden in Thin config.yaml file:
+
+    OMNIFILES_SETTINGS=$HOME/.local/share/omnifiles/settings.yaml omnifiles start -C $HOME/.local/share/omnifiles/thin.yaml
+
+Note that OmniFiles and Thin configs are two distinct configs.
+
 ## Usage
 
 1. Storing files.
@@ -88,4 +98,4 @@ using web browser or curl
 
 ## License information
 
-Please consult with the LICENSE.txt for license information. It is MIT by the way.
+Please consult with the LICENSE.txt for license information. It is MIT by the way.

data/bin/omnifiles

@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'thin'
 
 ARGV.unshift File.expand_path(File.join(File.dirname(File.expand_path(__FILE__)),"..","config.ru"))
 ARGV.unshift '-R'
-ARGV.unshift 'start'
 Thin::Runner.new(ARGV).run!

data/lib/omnifiles/settings.rb

@@ -4,7 +4,7 @@ module OmniFiles
 
   class Settings < Settingslogic
     settings_file = (ENV['OMNIFILES_SETTINGS'] or '')
-    raise "Please pecify a settings file in env OMNIFILES_SETTINGS" unless File.file?(settings_file)
+    raise "Please specify a settings file in env OMNIFILES_SETTINGS" unless File.file?(settings_file)
     source settings_file
     namespace ENV['RACK_ENV'] || 'development'
     load!

data/lib/omnifiles/version.rb

@@ -1,3 +1,3 @@
 module OmniFiles
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/omnifiles.gemspec

@@ -20,11 +20,11 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.7"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "sinatra", "~> 1.4.5"
-  spec.add_development_dependency "sinatra-assetpack", "~> 0.3.3"
-  spec.add_development_dependency "ruby-filemagic", "~> 0.6.0"
-  spec.add_development_dependency "sqlite3", "~> 1.3.10"
-  spec.add_development_dependency "haml", "~> 4.0.0"
-  spec.add_development_dependency "settingslogic", "~> 2.0.0"
-  spec.add_development_dependency "thin", "~> 1.6.0"
+  spec.add_runtime_dependency "sinatra", "~> 1.4.5"
+  spec.add_runtime_dependency "sinatra-assetpack", "~> 0.3.3"
+  spec.add_runtime_dependency "ruby-filemagic", "~> 0.6.0"
+  spec.add_runtime_dependency "sqlite3", "~> 1.3.10"
+  spec.add_runtime_dependency "haml", "~> 4.0.0"
+  spec.add_runtime_dependency "settingslogic", "~> 2.0.0"
+  spec.add_runtime_dependency "thin", "~> 1.6.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: omnifiles
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - theirix
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -45,7 +45,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.4.5
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -59,7 +59,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.3.3
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -73,7 +73,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -87,7 +87,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.3.10
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -101,7 +101,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -115,7 +115,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 2.0.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -129,7 +129,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 1.6.0
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: