neruda 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d27ec419fef855a84bea4e91b9330fbbe659e97c
-  data.tar.gz: 7a996318f08fdb881e941c321b67a958ddeaa845
+  metadata.gz: 4c8fbbf1db41f23369213ab8927398003b6a7d44
+  data.tar.gz: c1d8aa69a1c92389b20aef6f7e4f5a892dc3fe9f
 SHA512:
-  metadata.gz: 98b930b09fcb112273e61df48f5d39795b914c93ac1a1f69de41aa1097ac7cdb523944d4d31d21c77ec8caed9fb6086d8cfc7464ff73b20cb7a925cf3cc3abd5
-  data.tar.gz: 209f225bc0ccd7f5dfb949d49ddbbfbbd496136a0bbbc481e307564a6543eb7ffbe8462774037016bddaf480671c9ceb4aa1ef73257423a2a4bea6a9dd6bd8b9
+  metadata.gz: 5138eb7b6480997fb98bbc68dda232c5d9e5d9f59c5d8b86f1497f34173d191e8ab80440e676c616473aff485771b9ce97b87b005df321a97d6c84da8749965c
+  data.tar.gz: 331d2694272ae5d17859c27ed90579286b1bbcbb180fbd3615d94f91716f9fa5e27e1f8aa980ce1dfafa893f95e9e3355afde6190ad32d727beff7b43e44bd14

data/bin/pablo

@@ -24,6 +24,20 @@ module BundlerHelper
     return cmd.join(' ') if use_system
     exec(*cmd)
   end
+
+  def capify
+    unless File.exist? 'Capfile'
+      STDERR.puts Rainbow('ERROR: Capfile does not exist.').red
+      exit 1
+    end
+
+    capfile = File.new('Capfile', 'a')
+    capfile.write <<~EOF
+    neruda_spec = Gem::Specification.find_by_name 'neruda'
+    Dir.glob("\#{neruda_spec.gem_dir}/lib/tasks/*.rake").each { |r| import r }
+    Dir.glob("\#{neruda_spec.gem_dir}/lib/tasks/capistrano/*.rake").each { |r| import r }
+    EOF
+  end
 end
 
 # Methods used with pablo init method
@@ -125,6 +139,20 @@ module PabloInit
     puts 'To complete this installation, you must now run: ' +
          Rainbow('bundle install').yellow
   end
+
+  def pablo_init
+    puts Rainbow('Creating main folders…').blue
+    init_path
+    puts Rainbow('Populating config file…').blue
+    init_config
+    puts Rainbow('Copying template files…').blue
+    init_assets
+    puts Rainbow('Installing rake files…').blue
+    init_rackup
+    puts ''
+    puts Rainbow('Neruda has been successfully installed.').green
+    init_bundler if bundler_is_present?
+  end
 end
 
 # Main pablo class
@@ -135,35 +163,35 @@ class Pablo
     }
 
     parse_options
+    route_command
+  end
 
-    if ARGV[0] == 'init'
+  def route_command
+    case ARGV[0]
+    when 'init'
       pablo_init
 
-    elsif ARGV[0] == 'capify'
+    when 'capify'
       capify
 
-    elsif ['start', 'run'].include?(ARGV[0])
+    when 'start', 'run'
       start
 
-    elsif ARGV[0] == 'stop'
+    when 'stop'
       rake_or_bundle_run ['rake', 'sinatra:stop']
 
-    elsif ARGV[0] == 'compile'
+    when 'compile'
       rake_or_bundle_run ['rake', 'chapters:build_epubs'], true
       rake_or_bundle_run ['rake', 'book:make']
 
-    elsif ARGV[0] == 'new'
+    when 'new'
       new_chapter
 
-    elsif ARGV[0] == 'list'
+    when 'list'
       list
 
-    elsif ARGV[0] == 'board'
-      tiddly_file = 'private/notes/tiddly.html'
-      unless File.exist? tiddly_file
-        FileUtils.copy File.join(__dir__, '../lib/tiddly.html'), tiddly_file
-      end
-      exec 'gio', 'open', tiddly_file
+    when 'board'
+      board
     end
   end
 
@@ -173,8 +201,8 @@ class Pablo
     optparse = OptionParser.new do |opts|
       opts.banner = <<~EOF
         Usage:
-            pablo init
-            pablo [options] #{pablo_banner} [params]
+            pablo -h
+            pablo [ -v ] command
 
       EOF
       opts.on('-v', '--verbose', 'Output more information') do
@@ -182,21 +210,7 @@ class Pablo
       end
       opts.on('-h', '--help', 'Display this screen') do
         STDERR.puts opts
-        STDERR.puts <<~EOF
-
-          Commands:
-              init   : Initialize your Neruda instance
-              start  : Start the rack web server (default is thin)
-              stop   : Stop the web server
-              compile: Generate the epubs files
-              list   : List various book elements (chapters, characters, notes, sceneries)
-              board  : Open your TiddlyWiki file located at ./private/notes/tiddly.html
-
-          Chapters related commands:
-              new [title] : Create a new chapter
-
-        EOF
-        exit
+        pablo_help
       end
     end
 
@@ -211,39 +225,24 @@ class Pablo
   include BundlerHelper
   include PabloInit
 
-  def pablo_banner
-    options = ['start', 'stop', 'new', 'compile', 'list']
-    options << 'capify' if File.exist? 'Capfile'
-
-    "[ #{options.join(' | ')} ]"
-  end
-
-  def pablo_init
-    puts Rainbow('Creating main folders…').blue
-    init_path
-    puts Rainbow('Populating config file…').blue
-    init_config
-    puts Rainbow('Copying template files…').blue
-    init_assets
-    puts Rainbow('Installing rake files…').blue
-    init_rackup
-    puts ''
-    puts Rainbow('Neruda has been successfully installed.').green
-    init_bundler if bundler_is_present?
-  end
-
-  def capify
-    unless File.exist? 'Capfile'
-      STDERR.puts Rainbow('ERROR: Capfile does not exist.').red
-      exit 1
-    end
-
-    capfile = File.new('Capfile', 'a')
-    capfile.write <<~EOF
-    neruda_spec = Gem::Specification.find_by_name 'neruda'
-    Dir.glob("\#{neruda_spec.gem_dir}/lib/tasks/*.rake").each { |r| import r }
-    Dir.glob("\#{neruda_spec.gem_dir}/lib/tasks/capistrano/*.rake").each { |r| import r }
-  EOF
+  def pablo_help
+    STDERR.puts <<~EOF
+
+      Book Commands:
+          new [title]     Begin to write a new chapter
+          compile         Generate the epubs files
+          list [elements] List various book elements
+                          (chapters, characters, notes, sceneries)
+          board           Open your TiddlyWiki file located
+                          at ./private/notes/tiddly.html
+
+      System Commands
+          init            Initialize your Neruda instance
+                          (you just need to do it once).
+          start           Start a test web server
+          stop            Stop the web server
+    EOF
+    exit
   end
 
   def start
@@ -268,12 +267,16 @@ class Pablo
   end
 
   def list
-    if ARGV[1].nil?
-      STDERR.puts Rainbow('ERROR: No list type given.').red
-      STDERR.puts 'Enter one of [chapters, characters, notes, sceneries].'
-      exit 1
+    list_type = ARGV[1] || 'chapters'
+    rake_or_bundle_run ['rake', "book:list[#{list_type}]"]
+  end
+
+  def board
+    tiddly_file = 'private/notes/tiddly.html'
+    unless File.exist? tiddly_file
+      FileUtils.copy File.join(__dir__, '../lib/tiddly.html'), tiddly_file
     end
-    rake_or_bundle_run ['rake', "book:list[#{ARGV[1]}]"]
+    exec 'gio', 'open', tiddly_file
   end
 end
 

data/lib/neruda.rb

@@ -27,22 +27,29 @@ class Neruda::App < Sinatra::Base
   include Neruda::Url
   include Neruda::Chapter
 
+  def chdir
+    Dir.chdir settings.root if ENV['APP_ENV'] == 'production'
+  end
+
   def find_slug
     @slug = params[:chapter]
     halt 404 if @slug.nil?
   end
 
   def find_file(kind = 'org')
-    f = File.join('private', "#{kind}s", "#{@slug}.#{kind}")
+    if kind == 'epub'
+      f = File.join('private', 'epubs', "#{@slug}.epub")
+    elsif kind == 'chapters'
+      f = File.join('private', 'chapters', "#{@slug}.org")
+    else
+      f = File.join('private', "#{@slug}.#{kind}")
+    end
     halt 404 unless File.exist? f
     f
   end
 
-  def find_chapter
-    @org_file = find_file
-  end
-
   get '/epub/:chapter' do
+    chdir
     find_slug
     if @slug == 'all' && !Neruda::CONFIG['book_filename'].nil?
       @slug = Neruda::CONFIG['book_filename']
@@ -54,8 +61,9 @@ class Neruda::App < Sinatra::Base
   end
 
   get '/chapter/:chapter' do
+    chdir
     find_slug
-    find_chapter
+    @org_file = find_file('chapters')
     @content = Orgmode::Parser.load @org_file
     title # Force the early removal of the title
     slim :chapter
@@ -70,11 +78,13 @@ class Neruda::App < Sinatra::Base
   end
 
   get '/' do
+    chdir
     @slug = 'index'
     text_content = ''
     if File.exist? File.join('private', 'index.org')
-      find_chapter
+      @org_file = find_file
       @content = Orgmode::Parser.load @org_file
+      title
       text_content = @content.to_html
     end
 

data/lib/tasks/book.rake

@@ -7,8 +7,12 @@ namespace :book do
   desc 'List various book elements'
   task :list, :list_type do |_, args|
     list_type = args[:list_type]
-    next unless ['chapters', 'characters',
-                 'notes', 'sceneries'].include?(list_type)
+    unless ['chapters', 'characters',
+            'notes', 'sceneries'].include?(list_type)
+      STDERR.puts Rainbow("ERROR: #{list_type} is not a valid list type.").red
+      STDERR.puts 'Enter one of [chapters, characters, notes, sceneries].'
+      next
+    end
     Dir.glob("private/#{list_type}/*.org") do |filename|
       file_radix = File.basename(filename, '.org')
       title = file_radix.split('_').map(&:capitalize).join(' ')

data/lib/tasks/sinatra.rake

@@ -21,7 +21,11 @@ namespace :sinatra do
     cmd = ['rackup', "-E #{loc_env}", '-P', 'tmp/pids/neruda.pid']
     cmd << '-D' if loc_env == 'production'
     begin
-      sh(*cmd)
+      if ENV['APP_ENV'].nil?
+        system({ 'APP_ENV' => loc_env }, cmd.join(' '))
+      else
+        sh(*cmd)
+      end
     rescue Interrupt
       puts Rainbow(' Kthxbye').blue
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: neruda
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Étienne Deparis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-08 00:00:00.000000000 Z
+date: 2017-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow