fredit 0.0.6 → 0.0.9

data/README.md

@@ -59,9 +59,7 @@ application without the hassles of having to set up and run a local
 instance of it on their computer. Just run a `fredit`-enabled instance of
 your Rails app on a server that your collaborator can access through his
 or her browser. This `fredit`-enabled instance can have its own Rails
-environment, database, and git branch. You can add an authentication
-gateway and even run the instance as a special chrooted user if you want
-to make the sandbox more secure.
+environment, database, and git branch. 
 
 
 ## Install and setup

data/app/controllers/fredit_controller.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 class FreditController < ::ApplicationController
 
   layout false
@@ -16,9 +18,10 @@ class FreditController < ::ApplicationController
   def update
     @path = secure_path params[:file_path]
 
-    edit_msg = !params[:edit_message].blank? ? params[:edit_message] : "unspecified edit"
+    edit_msg = !params[:edit_message].blank? ? Shellwords.shellescape(params[:edit_message].gsub('"', '')) : "unspecified edit"
 
-    author = (session[:commit_author] = params[:commit_author])
+    session[:commit_author] = (params[:commit_author] || '').gsub(/['"]/, '')
+    author = session[:commit_author]
     if session[:commit_author].blank?
       flash.now[:notice] = "Edited By must not be blank"
       @source = params[:source]
@@ -29,14 +32,17 @@ class FreditController < ::ApplicationController
     if params[:commit] =~ /delete/i
       `git rm #@path`
       flash[:notice] = "#@path deleted"
-      `git commit --author="#{author}" -m "#{edit_msg}" #{@path}`
+      res = system %Q|git commit --author="#{author}" -m "#{edit_msg}" #{@path}|
       @path = nil
     else
       n = params[:source].gsub(/\r\n/, "\n")
       File.open(@path, 'w') {|f| f.write(n)}
-      `git add #{@path}`
+      system %Q|git add #{@path}|
       flash[:notice] = "#@path updated"
-      `git commit --author="#{author}" -m "#{edit_msg}" #{@path}`
+      res = system %Q|git commit --author="#{author}" -m "#{edit_msg}" #{@path}|
+    end
+    if res == false
+      flash[:notice] = "Something went wrong with git. Make sure you changed something and filled in required fields."
     end
     params.delete(:source)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fredit
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.9
   prerelease: 
 platform: ruby
 authors:
@@ -43,7 +43,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -244463729
+      hash: 234921565
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -52,11 +52,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -244463729
+      hash: 234921565
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
-summary: fredit 0.0.6
+summary: fredit 0.0.9
 test_files: []