emacs_org_protocol_server 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6cd216cbf9fc6631801e4c4d644c6dadf8cecb5f
-  data.tar.gz: 4c7a17b84adba7fa55daf9a9d041dd7cde73006c
+  metadata.gz: 2330fe9ed02f5f65068e804fbb1cce0f9f36ab41
+  data.tar.gz: faf5c3997e5a1263ac1baad1cf972427e477b4af
 SHA512:
-  metadata.gz: 279bdd2eb65b784fbf312c19fb4ac87d42812cbc10dbbb44b47ba68455d902347ae57cc0c73eb38dba2c1190c926803f1763ac73043b672137c3aa23b5ae0c59
-  data.tar.gz: 210ca79de52caa60a636ad96482f0763636dd6be8c1e2fef3efbd80ebe4e8638e887bb2e40a2cba01a6e13d166587af7bef72c2d484f59c62b136a4b735a919f
+  metadata.gz: 4728aa51f40c332e9ad4428d4c6de0f2a35c7e9a2e7f3ff71a24699770b4e4d741780470d80337afd7ff80ac80c8272579efacad56960e4f3b4071525606c16f
+  data.tar.gz: 0ffcf8f23e782b017d7f363050502a84c0e44c845d3b9269afa76e67f6fec367f721ae3752387f24b2cd929d31e2272ad063b338b288c166824a57e0ff32a8d0

data/README.md

@@ -24,31 +24,28 @@ Start it up:
 This will run the server on port 4567, and call
 `/usr/local/bin/emacsclient` to operate.
 
-## Command line options
+## Server Configuration
 
-The command line options are the same as for any standard Sinatra
-application:
+The server configuration is contained in the file `$HOME/.config/emacs_org_protocol_server.yml`, a standard YAML key-value pair file.
 
-    emacs-org-protocol-server [-h] [-x] [-e ENVIRONMENT] [-p PORT] [-o HOST] [-s HANDLER]
-
-Options are:
-
-    -h # help
-    -p # set the port (default is 4567)
-    -o # set the host (default is 0.0.0.0)
-    -e # set the environment (default is development)
-    -s # specify rack server/handler (default is thin)
-    -x # turn on the mutex lock (default is off)
-
-In addition, you may set what the path to the `emacsclient`
-application is by setting the environment variable `EMACSCLIENT`. For
-example:
+Example (defaults):
 
+``` yaml
+server: [thin, mongrel, webrick]
+port: 4567
+bind: 0.0.0.0
+emacsclient: /usr/local/bin/emacsclient
+```
 
-    EMACSCLIENT=/usr/bin/emacsclient emacs-org-protocol-server -p 9294 -e production
+You can also specify these via the environment, which will take precedence over the configuration file and the defaults:
 
-uses the `emacsclient` at `/usr/bin/emacsclient` running on port 9294
-in production.
+``` bash
+EMACS_ORG_PROTOCOL_CONFIG=./my_config.yml
+EMACS_ORG_PROTOCOL_BIND=127.0.0.1
+EMACS_ORG_PROTOCOL_PORT=9998
+EMACS_ORT_PROTOCOL_SERVER=thin
+EMACSCLIENT=/Application/Emacs.app/Content/MacOS/bin/emacsclient
+```
 
 ## Browser Configuration
 

data/emacs_org_protocol_server.gemspec

@@ -23,4 +23,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_dependency "thin"
   spec.add_dependency "sinatra"
+  spec.add_dependency "sinatra-contrib"
 end

data/lib/emacs_org_protocol_server/version.rb

@@ -1,3 +1,3 @@
 module EmacsOrgProtocolServer
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

data/lib/emacs_org_protocol_server.rb

@@ -1,12 +1,43 @@
 require "emacs_org_protocol_server/version"
 require 'sinatra/base'
 require 'uri'
+require 'yaml'
+require 'erb'
 
 module EmacsOrgProtocolServer
-  EMACSCLIENT=ENV['EMACSCLIENT'] || "/usr/local/bin/emacsclient"
+
+  class Settings
+    attr_accessor :emacsclient, :server, :port, :bind, :config_file, :settings
+    def initialize(server: '0.0.0.0', port: 4567, bind: '0.0.0.0', config_file: nil)
+      self.config_file = config_file || ENV['EMACS_ORG_PROTOCOL_CONFIG'] || File.join(ENV['HOME'], '.config', 'emacs_org_protocol_server.yml')
+      $stderr.puts "config_file: #{self.config_file.inspect}"
+
+      self.settings = {}
+      if File.exist?(self.config_file)
+        self.settings = YAML.load(
+          ERB.new(
+            File.read(self.config_file)
+            ).result
+          )
+      end
+
+      self.server      = ENV['EMACS_ORG_PROTOCOL_SERVER'] || settings["server"] || %w[thin mongrel webrick]
+      self.port        = ENV['EMACS_ORG_PROTOCOL_PORT']   || settings["port"]   || '4567'
+      self.bind        = ENV['EMACS_ORG_PROTOCOL_BIND']   || settings["bind"]   || '0.0.0.0'
+      self.emacsclient = ENV['EMACSCLIENT']               || "/usr/local/bin/emacsclient"
+    end
+  end
+
+
 
   class OPServ < Sinatra::Application
 
+    settings = Settings.new
+    set :server , settings.server
+    set :port   , settings.port
+    set :bind   , settings.bind
+    enable :logging
+
     helpers do
       def esc(s)
         URI.escape(s, %r{[^[:alnum:]]})
@@ -29,9 +60,9 @@ module EmacsOrgProtocolServer
       s=params['s'].to_s
 
       emacsclient_target = "org-protocol://#{p}:#{template}//#{esc(l)}/#{esc(t)}/#{esc(s)}"
-      cmd = "#{EMACSCLIENT} -n '#{emacsclient_target}'"
+      cmd = "#{settings.emacsclient} -n '#{emacsclient_target}'"
       system(cmd)
-      puts "ran #{cmd}"
+      $stderr.puts "ran #{cmd}"
       redirect to(params['l'])
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: emacs_org_protocol_server
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Tamara Temple
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra-contrib
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Simple Sinatra server to call org-protocol with emacsclient
 email:
 - tamouse@gmail.com