cmd_tools 4.0.0 → 4.0.1

data/lib/cmd_tools/commands/emacs_launch.rb

@@ -42,6 +42,6 @@ module ::CmdTools::Commands::EmacsLaunch
   end
 
   def self.is_gui_running?
-    %w[x ns].include?(`emacsclient -e "(window-system)"`.strip)
+    ::CmdTools::Config.emacs_window_systems.include?(`emacsclient -e "(window-system)"`.strip)
   end
 end

data/lib/cmd_tools/config.rb

@@ -8,14 +8,18 @@ module ::CmdTools::Config
   CONFIG_FILE = File.join(CONFIG_DIR, 'config.yaml')
   CONFIG_DEFAULT = {
     'emacs' => ENV['ALTERNATE_EDITOR'] || 'emacs',
+    'emacs_window_systems' => %w[x ns mac],
   }
 
+  @config = nil
+
   # (Re)load config file.
   def self.load
     need_dump = false
     @config = if File.readable?(CONFIG_FILE)
-                config = CONFIG_DEFAULT.merge(YAML.load_file(CONFIG_FILE))
-                need_dump = config.size > CONFIG_DEFAULT.size
+                config_from_file = YAML.load_file(CONFIG_FILE)
+                config = CONFIG_DEFAULT.merge(config_from_file)
+                need_dump = config_from_file.size != CONFIG_DEFAULT.size
 
                 config
               else
@@ -29,11 +33,17 @@ module ::CmdTools::Config
       open(CONFIG_FILE, 'w').write(@config.to_yaml)
     end
 
-    self
-  end
+    @config.each{|name, val|
+      var = "@#{name}"
+      instance_variable_set(var, val)
+      eval <<-EOS
+        def self.#{name}
+          #{var}
+        end
+      EOS
+    }
 
-  def self.emacs
-    @config['emacs']
+    self
   end
 
   self.load

data/lib/cmd_tools/version.rb

@@ -1,3 +1,3 @@
 module CmdTools
-  VERSION = '4.0.0'
+  VERSION = '4.0.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cmd_tools
 version: !ruby/object:Gem::Version
-  version: 4.0.0
+  version: 4.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby_patch
-  requirement: &87071520 !ruby/object:Gem::Requirement
+  requirement: &83228330 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,7 +21,7 @@ dependencies:
         version: '0.3'
   type: :development
   prerelease: false
-  version_requirements: *87071520
+  version_requirements: *83228330
 description: ! 'Command line tools. Please type