neruda 0.0.8 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 04121554db1e0ac41a7f46fbd6637965b4a8f34f
-  data.tar.gz: bc2068179eb7bf37a015a582192cb0ece626d534
+  metadata.gz: e3101ba04a16de9562d4834ebde5c9034103d14d
+  data.tar.gz: f50ebe738e0771b75ed532319e84cfe1027bea25
 SHA512:
-  metadata.gz: 18d435f12eb453b83a03406f38db204396a795520f8d44fdbb65f32b3ad4d8b45fb8ac136139441dff6bc6a849a3eb7c04ab52722a5cf51148854a731553bcb1
-  data.tar.gz: 10edec1726e5d3e6862be6eeec73b4ac33826b93cd8da20f6dd88160fdac3bf377422da29e94e17a57189b38c44ebd183696852a7b859dc37b6fb385ecaa88a8
+  metadata.gz: c3ca902065a455800fdd16b9b9ee0d81921b7971d4a25b9aa8e5bf0327ab05f97ddd39b7d710ab7937cee1b11a1b61e33b51ee04a140d31ad0418584de15c95d
+  data.tar.gz: 011f3df145a513b3b780fbf543db6eb5a76cd6c89acb8342428799bd32b3bfef21a38efc5019de9b686f4517bc642649fadbbd99864eb015b14e4bb957549a10

data/bin/pablo

@@ -20,8 +20,9 @@ module BundlerHelper
   def rake_or_bundle_run(cmd, use_system = false)
     cmd.insert(1, '-s') unless @options[:verbose]
     cmd = ['bundle', 'exec'] + cmd if bundler_is_present?
-    puts Rainbow(cmd.join(' ')).blue if @options[:verbose]
-    return cmd.join(' ') if use_system
+    joined_cmd = cmd.join(' ')
+    puts Rainbow(joined_cmd).blue if @options[:verbose]
+    return system(joined_cmd) if use_system
     exec(*cmd)
   end
 
@@ -32,11 +33,11 @@ module BundlerHelper
     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
+    capfile.write <<~CAPFILE
+      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 }
+    CAPFILE
   end
 end
 
@@ -93,13 +94,12 @@ module PabloInit
     end
 
     return if File.exist? 'config.ru'
-    rackup_conf = <<~EOF
-    # frozen_string_literal: true
+    IO.write 'config.ru', <<~CONFIG
+      # frozen_string_literal: true
 
-    require 'neruda'
-    run Neruda::App
-  EOF
-    IO.write('config.ru', rackup_conf)
+      require 'neruda'
+      run Neruda::App
+    CONFIG
   end
 
   def init_bundler
@@ -119,22 +119,21 @@ module PabloInit
     # end
     markup_gem = 'gem \'org-ruby\''
 
-    gemfile = <<~EOF
-    # frozen_string_literal: true
+    IO.write 'Gemfile', <<~GEMFILE
+      # frozen_string_literal: true
 
-    source 'https://rubygems.org'
+      source 'https://rubygems.org'
 
-    gem 'neruda'
-    #{markup_gem}
+      gem 'neruda'
+      #{markup_gem}
 
-    group :development do
-      gem 'capistrano'
-      gem 'capistrano-bundler'
-      gem 'capistrano-rvm'
-      gem 'rubocop'
-    end
-  EOF
-    IO.write('Gemfile', gemfile)
+      group :development do
+        gem 'capistrano'
+        gem 'capistrano-bundler'
+        gem 'capistrano-rvm'
+        gem 'rubocop'
+      end
+    GEMFILE
     puts ''
     puts 'To complete this installation, you must now run: ' +
          Rainbow('bundle install').yellow
@@ -161,42 +160,41 @@ class Pablo
     @options = {
       verbose: false
     }
-    @available_commands = ['capify', 'list', 'start', 'new_chapter',
+    @available_commands = ['capify', 'list', 'start', 'edit',
                            'setup', 'stop', 'compile']
 
     parse_options
+    # Be sure required directories are always there
+    init_path unless @arg == 'setup'
     route_command
   end
 
   def route_command
-    case @arg
-    when 'capify', 'list', 'start', 'new_chapter', 'setup'
-      send @arg
-
-    when 'stop'
+    if @arg == 'stop'
       rake_or_bundle_run ['rake', 'sinatra:stop']
-
-    when 'compile'
-      rake_or_bundle_run ['rake', 'chapters:build_epubs'], true
-      rake_or_bundle_run ['rake', 'book:make']
+      return
     end
+
+    ARGV.shift
+    send @arg
   end
 
   private
 
   def parse_options
     optparse = OptionParser.new do |opts|
-      opts.banner = <<~EOF
+      opts.banner = <<~HELP
         Usage:
             pablo -h
             pablo [ -v ] command
 
-      EOF
+      HELP
       opts.on('-v', '--verbose', 'Output more information') do
         @options[:verbose] = true
       end
       opts.on('-h', '--help', 'Display this screen') do
         STDERR.puts opts
+        STDERR.puts
         pablo_help
       end
     end
@@ -205,11 +203,17 @@ class Pablo
 
     @arg = ARGV[0]
     if @arg == 'new'
-      @arg = 'new_chapter'
+      @arg = 'edit'
     elsif @arg == 'run'
       @arg = 'start'
+    elsif @arg == 'init'
+      @arg = 'setup'
     end
 
+    if !File.exist?('config/config.yml') && @arg != 'setup'
+      STDERR.puts Rainbow('ERROR: please run pablo setup before all').red
+      exit 1
+    end
     return if @available_commands.include?(@arg)
     STDERR.puts Rainbow('ERROR: no or unknown command given.').red
     STDERR.puts Rainbow('Run pablo -h for options and available ' \
@@ -221,10 +225,10 @@ class Pablo
   include PabloInit
 
   def pablo_help
-    STDERR.puts <<~EOF
-
+    STDERR.puts <<~HELP
       Book Commands:
-          new [title]     Begin to write a new chapter
+          new  [title]    Begin to write a new chapter
+          edit [title]    Continue the writing of a chapter
           compile         Generate the epubs files
           list [elements] List various book elements
                           (chapters, characters, notes, sceneries)
@@ -234,11 +238,18 @@ class Pablo
                           (you just need to do it once).
           start           Start a test web server
           stop            Stop the web server
-    EOF
+    HELP
     exit
   end
 
+  def compile
+    rake_or_bundle_run ['rake', 'chapters:build_epubs'], true
+    rake_or_bundle_run ['rake', 'book:make'], true
+  end
+
   def start
+    compile
+
     loc_env = ENV['APP_ENV'] || 'development'
     if loc_env != 'production'
       puts Rainbow("Neruda is run in #{loc_env} environment").green
@@ -249,18 +260,18 @@ class Pablo
     rake_or_bundle_run ['rake', 'sinatra:start']
   end
 
-  def new_chapter
-    if ARGV[1].nil?
+  def edit
+    if ARGV[0].nil?
       print 'Title: '
       title = STDIN.gets.strip
     else
-      title = ARGV[1]
+      title = ARGV.join(' ')
     end
-    rake_or_bundle_run ['rake', "chapters:new[#{title}]"]
+    rake_or_bundle_run ['rake', "chapters:create_or_edit[#{title}]"]
   end
 
   def list
-    list_type = ARGV[1] || 'chapters'
+    list_type = ARGV[0] || 'chapters'
     rake_or_bundle_run ['rake', "book:list[#{list_type}]"]
   end
 end

data/lib/tasks/book.rake

@@ -53,7 +53,7 @@ namespace :book do
     end
     org_file.close
 
-    IO.write('tmp/org_to_convert.yml', [final_org].to_yaml)
+    IO.write 'tmp/org_to_convert.yml', [final_org].to_yaml
   end
 
   task make: ['book:prepare', 'chapters:convert_org']

data/lib/tasks/chapters.rake

@@ -16,7 +16,7 @@ namespace :chapters do
     end
     next if org_to_convert.empty?
     Dir.mkdir 'tmp' unless Dir.exist? 'tmp'
-    IO.write('tmp/org_to_convert.yml', org_to_convert.to_yaml)
+    IO.write 'tmp/org_to_convert.yml', org_to_convert.to_yaml
   end
 
   desc 'Identify orphan (without epubs) org files'
@@ -31,7 +31,7 @@ namespace :chapters do
       org_to_convert << filename unless File.exist? epub_file
     end
     next if org_to_convert.empty?
-    IO.write('tmp/org_to_convert.yml', org_to_convert.to_yaml)
+    IO.write 'tmp/org_to_convert.yml', org_to_convert.to_yaml
   end
 
   desc 'Convert org files from tmp/org_to_convert.yml to epubs'
@@ -45,10 +45,11 @@ namespace :chapters do
       file_radix = File.basename(filename, '.org')
       epub_file = "private/epubs/#{file_radix}.epub"
       epub_to_upload << epub_file
+      puts "Converting #{filename} to #{epub_file}"
       sh 'pandoc', '-S', "--output=#{epub_file}", filename
     end
     next if epub_to_upload.empty?
-    IO.write('tmp/epub_to_upload.yml', epub_to_upload.to_yaml)
+    IO.write 'tmp/epub_to_upload.yml', epub_to_upload.to_yaml
   end
 
   desc 'Build missing epubs'
@@ -93,11 +94,11 @@ namespace :chapters do
       title = f.in_buffer_settings['TITLE']
       chapters << { slug: file_radix, title: title } unless title.nil?
     end
-    IO.write('config/chapters.yml', chapters.to_yaml)
+    IO.write 'config/chapters.yml', chapters.to_yaml
   end
 
   desc 'Open an editor to create a new chapter'
-  task :new, :title do |_, args|
+  task :create_or_edit, :title do |_, args|
     if args[:title] == ''
       filename = 'new'
     else
@@ -108,20 +109,24 @@ namespace :chapters do
 
     unless File.exist? filename
       config = YAML.load_file('config/config.yml')
-      IO.write filename, <<~EOF
+      filecontent = <<~ORG
         #+title: #{args[:title]}
         #+date: <#{Date.today.strftime('%Y-%m-%d %a.')}>
         #+author: #{config['author']}
 
-
-      EOF
+      ORG
+      IO.write filename, filecontent
     end
 
     editor = ENV['EDITOR'] || ENV['VISUAL'] || 'emacs'
+
+    puts Rainbow(args[:title]).blue
+    puts "Opening #{filename} with #{editor}"
+
     if editor.match?(/^emacs/)
-      sh editor, '+5', filename
+      sh [editor, '+5', filename].join(' ')
     else
-      sh editor, filename
+      sh [editor, filename].join(' ')
     end
   end
 end

data/lib/tasks/sinatra.rake

@@ -6,7 +6,7 @@ namespace :sinatra do
   desc 'Stop the underlaying sinatra application'
   task :stop do
     unless File.exist? 'tmp/pids/neruda.pid'
-      STDERR.puts 'No pid file found'
+      STDERR.puts Rainbow('No pid file found').red
       exit 1
     end
     pid = IO.read('tmp/pids/neruda.pid').strip.to_i
@@ -27,7 +27,7 @@ namespace :sinatra do
         sh(*cmd)
       end
     rescue Interrupt
-      puts Rainbow(' Kthxbye').blue
+      puts Rainbow('Kthxbye').blue
     end
   end
 

metadata

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