neruda 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e3101ba04a16de9562d4834ebde5c9034103d14d
-  data.tar.gz: f50ebe738e0771b75ed532319e84cfe1027bea25
+  metadata.gz: b580faa2e64bd6358c78619c309d9568c79a1b66
+  data.tar.gz: ac61ff055b4c36d9f5afa967929cf53440136065
 SHA512:
-  metadata.gz: c3ca902065a455800fdd16b9b9ee0d81921b7971d4a25b9aa8e5bf0327ab05f97ddd39b7d710ab7937cee1b11a1b61e33b51ee04a140d31ad0418584de15c95d
-  data.tar.gz: 011f3df145a513b3b780fbf543db6eb5a76cd6c89acb8342428799bd32b3bfef21a38efc5019de9b686f4517bc642649fadbbd99864eb015b14e4bb957549a10
+  metadata.gz: e76d4ecfa5b9f1eba99b8b2348cc387bc14909e7815d8871b97c84416027df5450ded9ef0f34605d772fa87928c846b12b30a4d21e3ee4d03425d6ddfc9c8b2e
+  data.tar.gz: 917fad9923f0d548450c6ae5c7cc42b4cfa5238c787c39077abe9f385f1626d808cb9b74f845cdf59c851cd1e863a4f41192ca04c1c6e0274c4119d56aa1a45e

data/bin/pablo

@@ -181,6 +181,17 @@ class Pablo
 
   private
 
+  def handle_aliases
+    @arg = ARGV[0]
+    if @arg == 'new'
+      @arg = 'edit'
+    elsif @arg == 'run'
+      @arg = 'start'
+    elsif @arg == 'init'
+      @arg = 'setup'
+    end
+  end
+
   def parse_options
     optparse = OptionParser.new do |opts|
       opts.banner = <<~HELP
@@ -201,14 +212,7 @@ class Pablo
 
     optparse.parse!
 
-    @arg = ARGV[0]
-    if @arg == 'new'
-      @arg = 'edit'
-    elsif @arg == 'run'
-      @arg = 'start'
-    elsif @arg == 'init'
-      @arg = 'setup'
-    end
+    handle_aliases
 
     if !File.exist?('config/config.yml') && @arg != 'setup'
       STDERR.puts Rainbow('ERROR: please run pablo setup before all').red

data/lib/neruda.rb

@@ -19,8 +19,7 @@ class Neruda::App < Sinatra::Base
   configure :production, :development do
     # When used as a Gem, we lose the correct path.
     set :root, Dir.pwd
-    enable :logging
-    disable :method_override, :sessions
+    disable :logging, :method_override, :sessions
     mime_type :epub, 'application/epub+zip'
   end
 
@@ -28,7 +27,13 @@ class Neruda::App < Sinatra::Base
   include Neruda::Chapter
 
   def chdir
-    Dir.chdir settings.root if ENV['APP_ENV'] == 'production'
+    loc_env = 'development'
+    if ENV.key? 'APP_ENV'
+      loc_env = ENV['APP_ENV']
+    elsif ENV.key? 'RACK_ENV'
+      loc_env = ENV['RACK_ENV']
+    end
+    Dir.chdir settings.root if loc_env == 'production'
   end
 
   def find_slug
@@ -81,8 +86,9 @@ class Neruda::App < Sinatra::Base
     chdir
     @slug = 'index'
     text_content = ''
-    if File.exist? File.join('private', 'index.org')
-      @org_file = find_file
+    index_file = File.join('private', 'index.org')
+    if File.exist? index_file
+      @org_file = index_file
       @content = Orgmode::Parser.load @org_file
       title
       text_content = @content.to_html

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: neruda
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Étienne Deparis