From b78bbf2e3e948ab5f6bfd4d1002db8372f383a7d Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 13:35:22 +0200 Subject: [PATCH 1/9] added rspec, and net-sftp to bundle --- Gemfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Gemfile b/Gemfile index fc06556d..123d5b16 100644 --- a/Gemfile +++ b/Gemfile @@ -6,8 +6,9 @@ gem 'httparty' gem 'activesupport' gem 'method_source' gem 'net-ssh' -gem 'net-ssh' +gem 'net-sftp' gem 'rspec' gem 'memcached' gem 'el4r' +gem 'rspec', :group => [:development, :test] From b795e28d4fdd1d3c7bed8f404952ef3f856ba4c7 Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 13:36:44 +0200 Subject: [PATCH 2/9] set enconding in the file, using iso-8859-1 characters and giving error on utf-8 --- lib/view.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/view.rb b/lib/view.rb index d5209889..023c82d9 100644 --- a/lib/view.rb +++ b/lib/view.rb @@ -1,3 +1,4 @@ +# -*- encoding : iso-8859-1 -*- # # Represents a division of a window (in emacs terms, it's a window (which is within a frame)) # From be77f2b14d37dc068bb54dd97f9e0b0112cfe012 Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 13:37:16 +0200 Subject: [PATCH 3/9] change View class constant for mock variable to pass tests --- spec/remote_spec.rb | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spec/remote_spec.rb b/spec/remote_spec.rb index 8595a06f..7d35df07 100644 --- a/spec/remote_spec.rb +++ b/spec/remote_spec.rb @@ -31,10 +31,10 @@ def self.method_missing(meth, *args, &block); end before(:each) do $el = mock 'el' $el.stub!(:buffer_modified_p).and_return false - View = mock 'View' - View.stub!(:path).and_return '/tmp/remote_rb/tmp,hey.txt' - View.stub!(:file)#.and_return '/tmp/remote_rb/tmp,hey.txt' - View.stub!(:beep)#.and_return '/tmp/remote_rb/tmp,hey.txt' + view = mock 'View' + view.stub!(:path).and_return '/tmp/remote_rb/tmp,hey.txt' + view.stub!(:file)#.and_return '/tmp/remote_rb/tmp,hey.txt' + view.stub!(:beep)#.and_return '/tmp/remote_rb/tmp,hey.txt' end it "should save remotely" do From dc7ea33e2d4c14a86052860fee54311b7e275832 Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 13:45:48 +0200 Subject: [PATCH 4/9] Fixed rake command to execute tests --- Rakefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Rakefile b/Rakefile index c366cb2b..a28677a1 100644 --- a/Rakefile +++ b/Rakefile @@ -1,8 +1,8 @@ require 'rake' -require 'spec/rake/spectask' +require 'rspec/core/rake_task' # Define task -Spec::Rake::SpecTask.new(:spec) do |t| +RSpec::Core::RakeTask.new(:spec) do |t| end task :default => :spec From b85a2e169b32c03d06d054ae0f2b53e23971e912 Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 13:47:49 +0200 Subject: [PATCH 5/9] added travis for testing --- .travis.yml | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 00000000..b3a5c8b0 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,5 @@ +language: ruby +rvm: + - 1.8.7 + - 1.9.2 + - 1.9.3 From 293e8fcc828f0b27bc82f06459e0a6e561dc53ac Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 13:52:53 +0200 Subject: [PATCH 6/9] added rake to the gems --- Gemfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Gemfile b/Gemfile index 123d5b16..c94a316e 100644 --- a/Gemfile +++ b/Gemfile @@ -10,5 +10,6 @@ gem 'net-sftp' gem 'rspec' gem 'memcached' gem 'el4r' +gem 'rake' gem 'rspec', :group => [:development, :test] From 0bf270a6a2bd0088345f855150f0193d8f31e6ac Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 14:55:16 +0200 Subject: [PATCH 7/9] In a gem dependencies should be in the .gemspec not in Gemfile. Added daemons too --- Gemfile | 13 +------------ xiki.gemspec | 12 ++++++++++++ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Gemfile b/Gemfile index c94a316e..9e9ddcc3 100644 --- a/Gemfile +++ b/Gemfile @@ -1,15 +1,4 @@ source 'https://rubygems.org' -gem 'ruby2ruby' -gem 'ParseTree' -gem 'httparty' -gem 'activesupport' -gem 'method_source' -gem 'net-ssh' -gem 'net-sftp' -gem 'rspec' -gem 'memcached' -gem 'el4r' -gem 'rake' +gemspec -gem 'rspec', :group => [:development, :test] diff --git a/xiki.gemspec b/xiki.gemspec index 76984b49..9b0d6c8b 100644 --- a/xiki.gemspec +++ b/xiki.gemspec @@ -33,5 +33,17 @@ Gem::Specification.new do |s| # s.specification_version = 3 s.add_development_dependency("rspec", ["~> 2.3.0"]) + s.add_dependency 'ruby2ruby' + s.add_dependency 'ParseTree' + s.add_dependency 'httparty' + s.add_dependency 'activesupport' + s.add_dependency 'method_source' + s.add_dependency 'net-ssh' + s.add_dependency 'net-sftp' + s.add_dependency 'memcached' + s.add_dependency 'el4r' + s.add_dependency 'rake' + s.add_dependency 'daemons' + end From 0da49deda8fae0ea9bd2419044320f87ef46af08 Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 15:06:39 +0200 Subject: [PATCH 8/9] fixed error on rspec version --- xiki.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xiki.gemspec b/xiki.gemspec index 9b0d6c8b..3966b146 100644 --- a/xiki.gemspec +++ b/xiki.gemspec @@ -32,7 +32,7 @@ Gem::Specification.new do |s| # current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION # s.specification_version = 3 - s.add_development_dependency("rspec", ["~> 2.3.0"]) + s.add_development_dependency "rspec" s.add_dependency 'ruby2ruby' s.add_dependency 'ParseTree' s.add_dependency 'httparty' From 77c2b3f56be20a68dc35a20d17f56c8fe671add4 Mon Sep 17 00:00:00 2001 From: "Gamaliel A. Toro Herrera" Date: Mon, 13 Aug 2012 17:29:14 +0200 Subject: [PATCH 9/9] making server be able to start --- etc/command/xiki_process.rb | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/etc/command/xiki_process.rb b/etc/command/xiki_process.rb index 51820a2e..b2555b17 100644 --- a/etc/command/xiki_process.rb +++ b/etc/command/xiki_process.rb @@ -1,12 +1,13 @@ # Don't hard-code, generate with script? - or use __file path xiki env var! -require '/projects/xiki/lib/ol' -require 'core_ext' +require File.dirname(__FILE__) + '/../../lib/ol' +require 'active_support/core_ext' require 'menu' require 'launcher' -Xiki.init +# this init is not needed here +#Xiki.init # Make named pipes for input and output