runit-man 1.9.4 → 1.9.5

data/lib/runit-man/app.rb

@@ -1,9 +1,8 @@
-require 'ftools'
+require 'fileutils'
 require 'yajl/json_gem'
 require 'erubis'
 require 'sinatra/base'
 require 'sinatra/r18n'
-require 'runit-man/erb-to-erubis'
 require 'runit-man/helpers'
 
 MIN_TAIL      = 100
@@ -43,7 +42,7 @@ class RunitMan < Sinatra::Base
   get '/' do
     @scripts = [ 'jquery-1.4.4.min' ]
     @title = host_name
-    erb :index
+    erubis :index
   end
 
   get '/services' do
@@ -73,7 +72,7 @@ class RunitMan < Sinatra::Base
     return not_found if data.nil?
     @scripts = []
     @title = t.runit.services.log.title(h(name), h(host_name), h(count), h(data[:log_location]))
-    erb :log, :locals => data
+    erubis :log, :locals => data
   end
 
   get %r[^/([^/]+)/log(?:/(\d+))?\.txt$] do |name, count|
@@ -102,7 +101,7 @@ class RunitMan < Sinatra::Base
     @scripts = []
     @title = t.runit.view_file.title(h(data[:name]), h(host_name))
     content_type CONTENT_TYPES[:html], :charset => 'utf-8'
-    erb :view_file, :locals => data 
+    erubis :view_file, :locals => data 
   end
 
   get '/view.txt' do
@@ -147,8 +146,8 @@ class RunitMan < Sinatra::Base
         File.unlink(all_r_dir)
       end
       unless File.directory?(all_r_dir)
-        File.makedirs(log_dir)
-        File.copy(File.join(my_dir, 'log', 'run'), File.join(log_dir, 'run'))
+        FileUtils.mkdir_p(log_dir)
+        FileUtils.cp(File.join(my_dir, 'log', 'run'), File.join(log_dir, 'run'))
       end
       create_run_script(all_r_dir)
       unless File.symlink?(active_r_dir)

data/lib/runit-man/helpers.rb

@@ -1,12 +1,12 @@
 require 'socket'
 require 'runit-man/service_info'
 require 'runit-man/partials'
-require 'sinatra/content_for'
+require 'sinatra/content_for2'
 
 module Helpers
   include Rack::Utils
   include Sinatra::Partials
-  include Sinatra::ContentFor
+  include Sinatra::ContentFor2
   alias_method :h, :escape_html
 
   attr_accessor :even_or_odd_state

data/lib/runit-man/partials.rb

@@ -1,20 +1,18 @@
-# stolen from http://github.com/cschneid/irclogger/blob/master/lib/partials.rb
-#   and made a lot more robust by me
-# this implementation uses erb by default. if you want to use any other template mechanism
-#   then replace `erb` on line 13 and line 17 with `haml` or whatever
-module Sinatra::Partials
-  def partial(template, *args)
-    template_array = template.to_s.split('/')
-    template = template_array[0..-2].join('/') + "/_#{template_array[-1]}"
-    options = args.last.is_a?(Hash) ? args.pop : {}
-    options.merge!(:layout => false)
-    if collection = options.delete(:collection) then
-      collection.inject([]) do |buffer, member|
-        buffer << erb(:"#{template}", options.merge(:layout =>
-        false, :locals => {template_array[-1].to_sym => member}))
-      end.join("\n")
-    else
-      erb(:"#{template}", options)
-    end
-  end
-end
+# stolen from http://github.com/cschneid/irclogger/blob/master/lib/partials.rb
+#   and made a lot more robust by me
+module Sinatra::Partials
+  def partial(template, *args)
+    template_array = template.to_s.split('/')
+    template = template_array[0..-2].join('/') + "/_#{template_array[-1]}"
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    options.merge!(:layout => false)
+    if collection = options.delete(:collection) then
+      collection.inject([]) do |buffer, member|
+        buffer << erubis(:"#{template}", options.merge(:layout =>
+        false, :locals => {template_array[-1].to_sym => member}))
+      end.join("\n")
+    else
+      erubis(:"#{template}", options)
+    end
+  end
+end

data/views/{layout.erb → layout.erubis}

@@ -16,12 +16,12 @@
       </div>
 
       <div class="content">
-        <% yield_content :content %>
+        <%= yield_content :content %>
       </div>
 
       <div id="footer">
         <div class="content">
-          <% yield_content :footer %>
+          <%= yield_content :footer %>
         </div>
       </div>
 

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: runit-man
 version: !ruby/object:Gem::Version 
-  hash: 59
   prerelease: false
   segments: 
   - 1
   - 9
-  - 4
-  version: 1.9.4
+  - 5
+  version: 1.9.5
 platform: ruby
 authors: 
 - Akzhan Abdulin
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -40,7 +38,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -54,21 +51,20 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
-        - 0
-        version: "0"
+        - 1
+        - 1
+        version: "1.1"
   type: :runtime
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: sinatra-content-for
+  name: sinatra-content-for2
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -82,7 +78,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 11
         segments: 
         - 0
         - 4
@@ -98,7 +93,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -112,7 +106,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -126,7 +119,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -140,7 +132,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -163,7 +154,6 @@ extra_rdoc_files: []
 files: 
 - bin/runit-man
 - lib/runit-man/app.rb
-- lib/runit-man/erb-to-erubis.rb
 - lib/runit-man/helpers.rb
 - lib/runit-man/log_location_cache.rb
 - lib/runit-man/partials.rb
@@ -177,14 +167,14 @@ files:
 - public/css/tripoli.visual.css
 - public/js/jquery-1.4.4.min.js
 - public/js/runit-man.js
-- views/_service_action.erb
-- views/_service_info.erb
-- views/_service_signal.erb
-- views/_services.erb
-- views/index.erb
-- views/layout.erb
-- views/log.erb
-- views/view_file.erb
+- views/_service_action.erubis
+- views/_service_info.erubis
+- views/_service_signal.erubis
+- views/_services.erubis
+- views/index.erubis
+- views/layout.erubis
+- views/log.erubis
+- views/view_file.erubis
 - i18n/en.yml
 - i18n/ru.yml
 - sv/log/run
@@ -203,7 +193,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -212,7 +201,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"

data/lib/runit-man/erb-to-erubis.rb

@@ -1,17 +0,0 @@
-module Sinatra::Erb
-  def erb(content, options={})
-    begin
-      require 'erubis'
-      @@erb_class = Erubis::Eruby
-    rescue LoadError
-      require "erb"
-      @@erb_class = ::ERB
-    end
-    render(:erb, content, options)
-  end
-
-private
-  def render_erb(content, options = {})
-    @@erb_class.new(content).result(binding)
-  end
-end