rake run runs local merrol, titlebar shows current working dir, tweak…

…s to gemspec

Rakefile

@@ -8,15 +8,23 @@ task :build do
   system 'gem build merrol.gemspec'
 end
 
-desc 'installs the gem'
-task :install do
+desc 'builds and installs the gem'
+task :install => :build do
   system 'gem install merrol-0.0.0.gem'
 end
 
-desc 'build, install and run the gem'
+desc 'run local app'
 task :run do
-  system "mer"
+  require_relative 'lib/merrol'
+  Window.new(WORKING_DIR, [])
+  Gtk.main
 end
 
-task :default => [:spec, :build, :install, :run]
+desc 'runs gem version of app'
+task :mer do
+  system 'mer'
+end
+
+desc 'tests, builds, installs and runs the app'
+task :default => [:spec, :build, :install, :mer]
 

bin/mer

@@ -2,6 +2,6 @@
 
 require 'merrol'
 
-Window.new(APP_NAME, ARGV)
+Window.new(WORKING_DIR, ARGV)
 Gtk.main
 

lib/merrol.rb

@@ -3,6 +3,7 @@
 require 'yaml'
 
 APP_NAME = "Merrol"
+WORKING_DIR = Dir.getwd
 
 $LOAD_PATH << 'lib/merrol'
 require 'command_dispatcher'

lib/merrol/config/commands.yml

@@ -51,10 +51,6 @@ file:
     help: Closes an open file
     key: CTRL+W
 
-  quit:
-    help: Exit editor (ALT+F4 should also work)
-    key: CTRL+Q
-
 search:
   find:
     help: Find and replace. Uses grep to search the project
@@ -101,6 +97,10 @@ edit:
     help: Pastes text from the clipboard at the current cursor position
     key: CTRL+V
 
+  select:
+    help: Selects all text in current window
+    key: CTRL+A
+
   delete:
     help: Remove the selected text
     key: DELETE
@@ -134,12 +134,15 @@ tools:
     help: Goto to last error
     key: CTRL+E
 
-settings:
+application:
   numbers:
     help: Toggle line numbers
     key: CTRL+SHIFT+L
 
-general:
+  quit:
+    help: Exit editor (ALT+F4 should also work)
+    key: CTRL+Q
+
   cancel:
     help: Cancels (and hides) any open panels and returns to the last focused window
     key: ESC

merrol.gemspec

@@ -1,16 +1,11 @@
-# -*- encoding: utf-8 -*-
-lib = File.expand_path('../lib/', __FILE__)
-$:.unshift lib unless $:.include?(lib)
-
 Gem::Specification.new do |s|
   s.name        = "merrol"
   s.version     = "0.0.0"
-  s.platform    = Gem::Platform::RUBY
   s.authors     = "Phil Thompson"
   s.email       = "phil@electricvisions.com"
   s.homepage    = "http://merrol.com"
-  s.summary     = "Minimalist Editor for Ruby, Rails and Other Languages"
-  s.description = "An editor for Ruby, Rails and supporting langauges, written in Ruby with an open design to allow customization and improvement."
+  s.summary     = "MERROL - Minimalist Editor for Ruby, Rails and Other Languages"
+  s.description = "An editor for Ruby, Rails and supporting langauges, written in pure Ruby with an open design to allow customization and improvement."
   s.required_rubygems_version = ">= 1.3.6"
   s.rubyforge_project         = "merrol"