install darcs for travis

Author: lowfatcomputing

.ruby-version

@@ -0,0 +1 @@
+2.0.0

.travis.yml

@@ -0,0 +1,12 @@
+language: ruby
+env:
+  - TRAVIS_CONFIG_DIR=.travis
+before_install:
+  - cd $TRAVIS_CONFIG_DIR
+  - sh .travis_ssh_setup.sh
+install:
+  - sh .install_multiple_scms.sh
+  - sh .install_dependencies.sh
+  - gem install posix-spawn
+before_script:
+  - cd $TRAVIS_BUILD_DIR

.travis/.install_dependencies.sh

@@ -0,0 +1,13 @@
+#/usr/bin/env sh
+
+bazaar_plugins_path=`bzr --version |  awk '/bzrlib:/ {print $2}'`
+
+cd "$bazaar_plugins_path/plugins"
+
+sudo bzr branch lp:bzr-xmloutput
+
+sudo mv bzr-xmloutput xmloutput
+
+cd xmloutput
+
+python setup.py build_ext -i

.travis/.install_multiple_scms.sh

@@ -0,0 +1,5 @@
+sudo sh -c 'echo "deb http://opensource.wandisco.com/ubuntu precise svn18" >> /etc/apt/sources.list.d/subversion18.list'
+sudo wget -q http://opensource.wandisco.com/wandisco-debian.gpg -O- | sudo apt-key add -
+sudo apt-get update
+sudo apt-get install -y subversion cvs bzr mercurial darcs
+sudo ln -s /usr/bin/cvs /usr/bin/cvsnt

.travis/.travis_ssh_setup.sh

@@ -0,0 +1,3 @@
+ssh-keygen -t rsa -f ~/.ssh/id_rsa -N "" -q
+cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys
+ssh-keyscan -t rsa `hostname` >> ~/.ssh/known_hosts

README.md

@@ -1,4 +1,4 @@
-[![Ohloh SCM on Ohloh](https://www.ohloh.net/p/ohloh_scm/widgets/project_partner_badge.gif)](https://www.ohloh.net/p/ohloh_scm)
+[![Ohloh SCM on Ohloh](https://www.ohloh.net/p/ohloh_scm/widgets/project_partner_badge.gif)](https://www.ohloh.net/p/ohloh_scm) [![Build Status](https://travis-ci.org/blackducksoftware/ohloh_scm.svg?branch=master)](https://travis-ci.org/blackducksoftware/ohloh_scm)
 
 # Ohloh SCM
 
@@ -49,10 +49,17 @@ hg 1.1.2
 If you are using CVS instead of CVSNT, you can potentially try creating
 a shell alias or symlink mapping 'cvsnt' to 'cvs'.
 
+Ohloh SCM uses [posix-spawn](https://github.com/rtomayko/posix-spawn) to
+execute commands so ensure *posix-spawn* gem is installed
+
+``gem install posix-spawn``
+
+
 ## Usage with Bundler
 
 ```
 gem 'ohloh_scm', git: 'https://github.com/blackducksw/ohloh_scm/', require: 'scm'
+gem 'posix-spawn'
 ```
 ## Running
 

lib/ohloh_scm/adapters/bzr/misc.rb

@@ -10,7 +10,7 @@ def exist?
 		end
 
 		def ls_tree(token)
-			run("cd #{path} && bzr ls -V -r #{to_rev_param(token)}").split("\n")
+      run("cd #{path} && bzr ls -V -r #{to_rev_param(token)}").split("\n")
 		end
 
 		def to_rev_param(r=nil)

lib/ohloh_scm/adapters/bzrlib/bzrlib_pipe_client.rb

@@ -1,14 +1,14 @@
 require 'rubygems'
-require 'open4'
+require 'posix/spawn'
 
 class BzrPipeClient
   def initialize(repository_url)
     @repository_url = repository_url
     @py_script = File.dirname(__FILE__) + '/bzrlib_pipe_server.py'
   end
-  
+
   def start
-    @pid, @stdin, @stdout, @stderr = Open4::popen4 "python #{@py_script}"
+    @pid, @stdin, @stdout, @stderr = POSIX::Spawn::popen4 "python #{@py_script}"
     open_repository
   end
 
@@ -27,8 +27,9 @@ def send_command(cmd)
     # send the command
     @stdin.puts cmd
     @stdin.flush
+    return if cmd == "QUIT"
 
-    # get status on stderr, first letter indicates state, 
+    # get status on stderr, first letter indicates state,
     # remaing value indicates length of the file content
     status = @stderr.read(10)
     flag = status[0,1]
@@ -46,6 +47,7 @@ def send_command(cmd)
 
   def shutdown
     send_command("QUIT")
+    [@stdout, @stdin, @stderr].each { |io| io.close unless io.closed? }
     Process.waitpid(@pid, Process::WNOHANG)
   end
 end

lib/ohloh_scm/adapters/bzrlib_adapter.rb

@@ -5,13 +5,13 @@ module OhlohScm::Adapters
 	class BzrlibAdapter < BzrAdapter
 
     def setup
-      @bzr_client = BzrPipeClient.new(url)
-      @bzr_client.start
+      bzr_client = BzrPipeClient.new(url)
+      bzr_client.start
+      bzr_client
     end
 
     def bzr_client
-      setup unless @bzr_client
-      return @bzr_client
+      @bzr_client ||= setup
     end
 
     def cleanup

lib/ohloh_scm/adapters/hg/cat_file.rb

@@ -1,3 +1,5 @@
+require 'shellwords'
+
 module OhlohScm::Adapters
 	class HgAdapter < AbstractAdapter
 		def cat_file(commit, diff)
@@ -20,7 +22,7 @@ def cat(revision, path)
 		# Example:
 		#     "Foo Bar & Baz" => "Foo\ Bar\ \&\ Baz"
 		def escape(path)
-			path.gsub(/[ `'"&()<>|#\$]/) { |c| '\\' + c }
+			path.shellescape
 		end
 	end
 end