dotremap 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 401825fbab15250619f14ea781ceff9f345819b6
-  data.tar.gz: 5c1630693db09459e9b23d794f509795ad8897f4
+  metadata.gz: 6a0be0149bc8f1e2f22a3530011bb12951a162b7
+  data.tar.gz: 613a9476f47e93566e72550551c5c380de128450
 SHA512:
-  metadata.gz: 567031667b38d096621e099ff818b0dcdad609df05f58b326942aa26bfcf03e83589d57fe380819c8085fa5b91903ceaf961f49e9e58fd09269a50e85f6870d8
-  data.tar.gz: b5546f823689fd450952619f5f01c68970b9c073ebc26e60f73acc8af8eac4c803b60c0f3cb26a3074cdfe498b89e51e4b72eb80fc5e886f73004fc73179a006
+  metadata.gz: 732d4e7c57cb83a53c4af0092d6ed1876b79edb35bbdd723ae21c315a7cd57ab7b6d95feea8ed97966cc2bbfae0feb256eeda686bc9af4589ff0301dbebfeb6e
+  data.tar.gz: 0e8b8b641b31f4d6b41a0625a90da035acfc2732a5cbf8ce4b00424e6abab4d4d327cbdcc87ba12150d1c12ca3f1d962a068740f3dbcec44d843918378056862

data/README.md

@@ -44,11 +44,8 @@ It will replace KeyRemap4MacBook's private.xml with compiled ~/.remap:
 </root>
 ```
 
-### 3. Reload private.xml and update config
-
-You have to reload private.xml to activate compiled configurations.
-
-![](https://raw.githubusercontent.com/k0kubun/dotremap/master/reload.gif)
+dotremap will automatically execute "ReloadXML".  
+Then activate your favorite configurations.
 
 ## Example
 

data/bin/dotremap

@@ -8,5 +8,4 @@ require "dotremap"
 DOTREMAP_PATH = File.expand_path("~/.remap")
 
 dotremap = Dotremap.new(DOTREMAP_PATH)
-dotremap.compile
-dotremap.replace_private_xml
+dotremap.apply_configuration

data/example.rb

@@ -33,7 +33,7 @@ item "Exchange Control + Space and Command + Space" do
 end
 
 item "CapsLock ON", config_not: "notsave.private_capslock_on" do
-  remap "Cmd-L", to: ["capslock", "VK_CONFIG_FORCE_OFF_notsave_private_capslock_on"]
+  remap "Cmd-L", to: ["capslock", "VK_CONFIG_FORCE_ON_notsave_private_capslock_on"]
 end
 
 item "CapsLock OFF", config_only: "notsave.private_capslock_on" do
@@ -66,7 +66,7 @@ end
 # Use Cmd_R+B/F as M-b/f, and Cmd_R+S as Cmd+F to avoid conflict with M-f
 item "[Not Terminal] Command+B/F to Option+Left/Right, Command+S to Command+F", not: "TERMINAL" do
   remap "Cmd-B", to: "Opt-Left"
-  remap "Cmd-B", to: "Opt-Left"
+  remap "Cmd-F", to: "Opt-Right"
   remap "Cmd-S", to: "Cmd-F"
 end
 
@@ -115,8 +115,8 @@ item "Shift by control" do
 end
 
 item "Exchange single quote and double quote" do
-  remap "'", to: "Shift-'"
   remap "Shift-'", to: "'"
+  remap "'", to: "Shift-'"
 end
 
 item "[Only Terminal] Command+A to Option+A", only: "TERMINAL" do

data/lib/dotremap/version.rb

@@ -1,3 +1,3 @@
 class Dotremap
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/dotremap.rb

@@ -4,44 +4,37 @@ require "unindent"
 require "fileutils"
 
 class Dotremap
+  XML_FILE_NAME = "private.xml"
   OLD_XML_DIR = File.expand_path("~/Library/Application Support/KeyRemap4MacBook")
   NEW_XML_DIR = File.expand_path("~/Library/Application Support/Karabiner")
-  XML_FILE_NAME = "private.xml"
+  OLD_APP_PATH = "/Applications/KeyRemap4MacBook.app"
+  NEW_APP_PATH = "/Applications/Karabiner.app"
+  RELOAD_XML_PATH = "Contents/Applications/Utilities/ReloadXML.app"
 
   def initialize(config_path)
     @config_path = config_path
-    @root = Root.new
   end
-  attr_reader :config_path, :root
-
-  def compile
-    validate_config_existence
+  attr_reader :config_path
 
-    config = File.read(config_path)
-    root.instance_eval(config)
+  def apply_configuration
+    replace_private_xml
+    reload_xml
+    puts "Successfully updated Karabiner configuration"
   end
 
+  private
+
   def replace_private_xml
     ensure_xml_dir_existence
     remove_current_xml
     write_new_xml
-    puts "Successfully generated private.xml"
   end
 
-  private
+  def reload_xml
+    app_path = File.exists?(OLD_APP_PATH) ? OLD_APP_PATH : NEW_APP_PATH
+    reload_xml_path = File.join(app_path, RELOAD_XML_PATH)
 
-  def validate_config_existence
-    return if File.exists?(config_path)
-
-    File.write(config_path, <<-EOS.unindent)
-      #!/usr/bin/env ruby
-
-      # # Example
-      # item "Command+E to Command+W", not: "TERMINAL" do
-      #   identifier "option.not_terminal_opt_e"
-      #   autogen "__KeyToKey__ KeyCode::E, VK_COMMAND, KeyCode::W, ModifierFlag::COMMAND_L"
-      # end
-    EOS
+    system("open #{reload_xml_path}")
   end
 
   def ensure_xml_dir_existence
@@ -55,7 +48,31 @@ class Dotremap
   end
 
   def write_new_xml
-    File.write(File.join(OLD_XML_DIR, XML_FILE_NAME), root.to_xml)
-    File.write(File.join(NEW_XML_DIR, XML_FILE_NAME), root.to_xml)
+    File.write(File.join(OLD_XML_DIR, XML_FILE_NAME), new_xml)
+    File.write(File.join(NEW_XML_DIR, XML_FILE_NAME), new_xml)
+  end
+
+  def new_xml
+    return @new_xml if defined?(@new_xml)
+    validate_config_existence
+
+    root = Root.new
+    config = File.read(config_path)
+    root.instance_eval(config)
+    @new_xml = root.to_xml.gsub(/ *$/, "")
+  end
+
+  def validate_config_existence
+    return if File.exists?(config_path)
+
+    File.write(config_path, <<-EOS.unindent)
+      #!/usr/bin/env ruby
+
+      # # Example
+      # item "Command+E to Command+W", not: "TERMINAL" do
+      #   identifier "option.not_terminal_opt_e"
+      #   autogen "__KeyToKey__ KeyCode::E, VK_COMMAND, KeyCode::W, ModifierFlag::COMMAND_L"
+      # end
+    EOS
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dotremap
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Takashi Kokubun
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -78,7 +78,6 @@ files:
 - lib/dotremap/remap.rb
 - lib/dotremap/root.rb
 - lib/dotremap/version.rb
-- reload.gif
 homepage: https://github.com/k0kubun/dotremap
 licenses:
 - MIT