gitdocs 0.3.2 → 0.3.3

data/gitdocs.gemspec

@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'sqlite3', "~> 1.3.4"
   s.add_dependency 'activerecord', "~> 3.1.0"
   s.add_dependency 'grit', "~> 2.4.1"
+  s.add_dependency 'shell_tools', "~> 0.1.0"
 
   s.add_development_dependency 'minitest', "~> 2.6.1"
   s.add_development_dependency 'rake'

data/lib/gitdocs/public/css/app.css

@@ -4,14 +4,14 @@ body {
   font-family: Helvetica, Arial, Verdana;
 }
 
-body h1, h2 {
+h1, h2 {
   margin: 0;
   padding-bottom: 0.8em;
   font-weight: bold;
 }
 
-body h1 { font-size: 1.8em; }
-body h2 { font-size: 1.5em; margin-top: 0.2em; }
+h1 { font-size: 1.8em; }
+h2 { font-size: 1.5em; margin-top: 0.2em; }
 
 .nav h1 {
   text-align: center;
@@ -47,7 +47,7 @@ div.share input {
   width :100%;
 }
 
-body .container {
+.container {
   min-width: 700px;
   background: #FCEA97;
   border-style: solid;
@@ -58,21 +58,27 @@ body .container {
   margin-top: 1.2em;
 }
 
-body a { text-decoration: none; color: #33e; }
-body a:hover { text-decoration: underline; }
+.container .inline-file {
+	width:100%;
+	min-height: 600px;
+	background: white;
+}
+
+a { text-decoration: none; color: #33e; }
+a:hover { text-decoration: underline; }
 
-body #editor {
+#editor {
   position: relative;
   width: 700px;
   height: 600px;
   margin-bottom: 1em;
 }
 
-body form.upload, form.add {
+form.upload, form.add {
   padding-top: 1.4em;
 }
 
-body form.upload p, form.add p {
+form.upload p, form.add p {
   padding-bottom: 0.6em;
   font-weight: bold;
 }

data/lib/gitdocs/runner.rb

@@ -1,5 +1,7 @@
 module Gitdocs
   class Runner
+    include ShellTools
+
     attr_reader :root, :listener
 
     def initialize(share)
@@ -148,18 +150,10 @@ module Gitdocs
       (val.nil? || val.empty?) ? default : val
     end
 
-    def sh(cmd)
-      out, code = sh_with_code(cmd)
-      code == 0 ? out : raise(out.empty? ? "Running `#{cmd}' failed. Run this command directly for more detailed output." : out)
-    end
-
     # Run in shell, return both status and output
     # @see #sh
     def sh_with_code(cmd)
-      cmd << " 2>&1"
-      outbuf = ''
-      outbuf = `cd "#{@root}" && #{cmd}`
-      [outbuf, $?]
+      ShellTools.sh_with_code(cmd, @root)
     end
   end
 end

data/lib/gitdocs/server.rb

@@ -1,6 +1,7 @@
 require 'thin'
 require 'renee'
 require 'coderay'
+require 'uri'
 
 module Gitdocs
   class Server
@@ -37,7 +38,7 @@ module Gitdocs
             var :int do |idx|
               gd = gds[idx]
               halt 404 if gd.nil?
-              file_path = request.path_info
+              file_path = URI.unescape(request.path_info)
               file_ext  = File.extname(file_path)
               expanded_path = File.expand_path(".#{file_path}", gd.root)
               halt 400 unless expanded_path[/^#{Regexp.quote(gd.root)}/]
@@ -45,7 +46,8 @@ module Gitdocs
               parent = '' if parent == '/'
               parent = nil if parent == '.'
               locals = {:idx => idx, :parent => parent, :root => gd.root, :file_path => expanded_path}
-              mode, mime = request.params['mode'], `file -I #{expanded_path}`.strip
+              mode, mime = request.params['mode'], `file -I #{ShellTools.escape(expanded_path)}`.strip
+              puts "mode, mime: #{mode.inspect}, #{mime.inspect}"
               if mode == 'save' # Saving
                 File.open(expanded_path, 'w') { |f| f.print request.params['data'] }
                 redirect! "/" + idx.to_s + file_path
@@ -65,11 +67,15 @@ module Gitdocs
               elsif mode == 'edit' && mime.match(%r{text/}) # edit file
                 contents = File.read(expanded_path)
                 render! "edit", :layout => 'app', :locals => locals.merge(:contents => contents)
-              elsif mode != 'raw' && mime.match(%r{text/}) # render file
+              elsif mode != 'raw' # render file
                 begin # attempting to render file
                   contents = '<div class="tilt">'  + Tilt.new(expanded_path).render + '</div>'
                 rescue RuntimeError => e # not tilt supported
-                  contents = '<pre class="CodeRay">' + CodeRay.scan_file(expanded_path).encode(:html) + '</pre>'
+                  contents = if mime.match(%r{text/})
+                    '<pre class="CodeRay">' + CodeRay.scan_file(expanded_path).encode(:html) + '</pre>'
+                  else
+                    %|<embed class="inline-file" src="/#{idx}#{request.path_info}?mode=raw"></embed>|
+                  end
                 end
                 render! "file", :layout => 'app', :locals => locals.merge(:contents => contents)
               else # other file

data/lib/gitdocs/version.rb

@@ -1,3 +1,3 @@
 module Gitdocs
-  VERSION = "0.3.2"
+  VERSION = "0.3.3"
 end

data/lib/gitdocs.rb

@@ -1,15 +1,17 @@
-require 'gitdocs/version'
-require 'gitdocs/configuration'
-require 'gitdocs/runner'
-require 'gitdocs/server'
-require 'gitdocs/cli'
-require 'gitdocs/manager'
 require 'thread'
 require 'rb-fsevent'
 require 'growl'
 require 'yajl'
 require 'dante'
 require 'socket'
+require 'shell_tools'
+
+require 'gitdocs/version'
+require 'gitdocs/configuration'
+require 'gitdocs/runner'
+require 'gitdocs/server'
+require 'gitdocs/cli'
+require 'gitdocs/manager'
 
 module Gitdocs
 

data/test/configuration_test.rb

@@ -2,7 +2,7 @@ require File.expand_path('../test_helper', __FILE__)
 
 describe "gitdocs configuration" do
   before do
-    capture_out { @config = Gitdocs::Configuration.new("/tmp/gitdocs") }
+    ShellTools.capture { @config = Gitdocs::Configuration.new("/tmp/gitdocs") }
   end
 
   it "has sensible default config root" do

data/test/test_helper.rb

@@ -11,38 +11,14 @@ FakeWeb.allow_net_connect = false
 ## Kernel Extensions
 require 'stringio'
 
-module Kernel
-  # Redirect standard out, standard error and the buffered logger for sprinkle to StringIO
-  # capture_stdout { any_commands; you_want } => "all output from the commands"
-  def capture_out
-    yield and return if ENV['DEBUG']
-    begin
-      old_out, old_err = STDOUT.dup, STDERR.dup
-      stdout_read, stdout_write = IO.pipe
-      stderr_read, stderr_write = IO.pipe
-      $stdout.reopen(stdout_write)
-      $stderr.reopen(stderr_write)
-      yield
-      stdout_write.close
-      stderr_write.close
-      out = stdout_read.rewind && stdout_read.read rescue nil
-      err = stderr_read.rewind && stderr_read.read rescue nil
-      [out, err]
-    ensure
-      $stdout.reopen(old_out)
-      $stderr.reopen(old_err)
-    end
-  end
-end
-
 class MiniTest::Spec
   def with_clones(count = 3)
     FileUtils.rm_rf("/tmp/gitdocs")
     master_path = "/tmp/gitdocs/master"
     FileUtils.mkdir_p("/tmp/gitdocs/master")
-    capture_out { `git init /tmp/gitdocs/master --bare` }
+    ShellTools.capture { `git init /tmp/gitdocs/master --bare` }
     sub_paths = count.times.map do |c|
-      capture_out { `cd /tmp/gitdocs && git clone file://#{master_path} #{c}` }
+      ShellTools.capture { `cd /tmp/gitdocs && git clone file://#{master_path} #{c}` }
       conf_path = "/tmp/gitdocs/config/#{c}"
       FileUtils.mkdir_p(conf_path)
       ["/tmp/gitdocs/#{c}", conf_path]

metadata

@@ -2,7 +2,7 @@
 name: gitdocs
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors: 
 - Josh Hull
@@ -158,29 +158,29 @@ dependencies:
   type: :runtime
   version_requirements: *id013
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: shell_tools
   prerelease: false
   requirement: &id014 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 2.6.1
-  type: :development
+        version: 0.1.0
+  type: :runtime
   version_requirements: *id014
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: minitest
   prerelease: false
   requirement: &id015 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: "0"
+        version: 2.6.1
   type: :development
   version_requirements: *id015
 - !ruby/object:Gem::Dependency 
-  name: mocha
+  name: rake
   prerelease: false
   requirement: &id016 !ruby/object:Gem::Requirement 
     none: false
@@ -191,7 +191,7 @@ dependencies:
   type: :development
   version_requirements: *id016
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: mocha
   prerelease: false
   requirement: &id017 !ruby/object:Gem::Requirement 
     none: false
@@ -201,6 +201,17 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id017
+- !ruby/object:Gem::Dependency 
+  name: fakeweb
+  prerelease: false
+  requirement: &id018 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+  type: :development
+  version_requirements: *id018
 description: Open-source Dropbox using Ruby and Git.
 email: 
 - joshbuddy@gmail.com