sekka 1.7.1 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 68e39f2abd18a04dded3aa414d166935798ea4b7
-  data.tar.gz: dd3c4f863160bc9d7d7310f5783f1ffbfcfdeba3
+  metadata.gz: 7862206715c3be6515eb94548f4b9b1319253f20
+  data.tar.gz: 8610db12f9edecd3743939fd7bd12e6a981dac4c
 SHA512:
-  metadata.gz: a476ff53c1f26fe54f027916db088c7acbf4bad6a26874869f33e3b57045de9ff280c3364ade55af903846e68ef966faf9e9b032e31da3134dc8e10662d4ff0b
-  data.tar.gz: e74a861ddaaf1177b97f75f58a4236946c694375da1aee3c050965927d5751f218ecfdb6fcea5a17a885fa229c85788594c440caeb443bf50a31dbd3a61e16b4
+  metadata.gz: 4623d9554fb19649da1fb14a9b8943a3859192eb14fbc16e28f8cac35ef796e4748f4283adaebb009522d1c0edebb8d2e247f388209e209e8a3329c23426323a
+  data.tar.gz: 7a58c0d685e0691be63801c11c96f825b0d36a32c961fd64ab50a6d3e8bdfa90c70490b2ec284ad7a5607efb30678392d6bf60b1dfd20e913cc75cab5df31e12

data/Rakefile

@@ -10,6 +10,9 @@
 #   4. rake release
 #   5. gem push pkg/sekka-x.x.x.gem   ( need gem version 1.3.6 or higer. Please "gem update --system" to update )
 #
+# Release jar one-binary Engineering:
+#   1. cd warbler ; make
+#
 # Enviroment Variables:
 #   Please select from
 #     DB=gdbm

data/VERSION.yml

@@ -1,4 +1,4 @@
 ---
 :major: 1
-:minor: 7
-:patch: 1
+:minor: 8
+:patch: 0

data/bin/sekka-server

@@ -124,7 +124,7 @@ def downloadFile( targetfile, sumfile, urlurl, sumurl )
     # 辞書のURLをダウンロードする
     dl = Downloader.new( urlurl )
     dl.download()
-    targeturl = dl.getBody().chomp
+    targeturl = dl.getBody().chomp.chomp
     dl.clearBody()
 
     # md5記載ファイルをダウンロード
@@ -135,7 +135,7 @@ def downloadFile( targetfile, sumfile, urlurl, sumurl )
     dl.clearBody()
     
     # 辞書ファイル本体をダウンロード
-    STDERR.printf( "   downloading URL : %s ...\n", targeturl );
+    STDERR.printf( "   downloading URL : [%s] ...\n", targeturl );
     dl = Downloader.new( targeturl )
     dl.downloadToFile( targetfile )
     dl.clearBody()

data/emacs/sekka.el

@@ -3,7 +3,7 @@
 ;; Copyright (C) 2010-2014 Kiyoka Nishiyama
 ;;
 ;; Author: Kiyoka Nishiyama <kiyoka@sumibi.org>
-;; Version: 1.7.1          ;;SEKKA-VERSION
+;; Version: 1.8.0          ;;SEKKA-VERSION
 ;; Keywords: ime, skk, japanese
 ;; Package-Requires: ((cl-lib "0.3") (concurrent "0.3.1") (popup "0.5.2"))
 ;; URL: https://github.com/kiyoka/sekka
@@ -57,7 +57,7 @@
   :group 'input-method
   :group 'Japanese)
 
-(defcustom sekka-server-url "http://localhost:12929/"
+(defcustom sekka-server-url "http://127.0.0.1:12929/"
   "SekkaサーバーのURLを指定する。"
   :type  'string
   :group 'sekka)
@@ -1756,7 +1756,7 @@ point から行頭方向に同種の文字列が続く間を漢字変換しま
 (setq default-input-method "japanese-sekka")
 
 (defconst sekka-version
-  "1.7.1" ;;SEKKA-VERSION
+  "1.8.0" ;;SEKKA-VERSION
   )
 (defun sekka-version (&optional arg)
   "入力モード変更"

data/gemfiles/Gemfile

@@ -8,3 +8,4 @@ gem "nendo"
 gem "json"
 gem "rake"
 gem "ruby-progressbar"
+gem "warbler", "1.4.10"

data/lib/sekka/downloader.rb

@@ -43,11 +43,27 @@ class Downloader
     @body = nil
   end
 
+  def httpInstance(scheme,host,port)
+    if scheme == 'https'
+      http_proxy = ENV['https_proxy']
+    else
+      http_proxy = ENV['http_proxy']
+    end
+    if http_proxy
+      (p_host,p_port) = http_proxy.split(':')
+      proxy_class = Net::HTTP::Proxy(p_host,p_port.to_i)
+      http = proxy_class.new(host,port)
+    else
+      http = Net::HTTP.new(host,port)
+    end
+    return http
+  end
+
   def download()
     url = URI.parse(@url_str)
     if(url)
       req = Net::HTTP::Get.new(url.path)
-      http = Net::HTTP.new(url.host,url.port)
+      http = httpInstance(url.scheme,url.host,url.port)
       if url.scheme == 'https'
         http.use_ssl = true
       end
@@ -59,8 +75,8 @@ class Downloader
 
   def downloadToFile(path)
     url = URI.parse(@url_str)
-    req = Net::HTTP::Get.new url.path
-    http = Net::HTTP.new(url.host, url.port)
+    req = Net::HTTP::Get.new(url.path)
+    http = httpInstance(url.scheme,url.host,url.port)
     if url.scheme == 'https'
       http.use_ssl = true
     end

data/lib/sekka/sekkaversion.rb

@@ -1,4 +1,4 @@
 class SekkaVersion
-  def  self.version()     "1.7.1"  end
+  def  self.version()     "1.8.0"  end
   def  self.dictVersion() "1.6.2"  end
 end

data/lib/sekkaserver.rb

@@ -41,7 +41,6 @@ require 'uri'
 require 'date'
 require 'sekkaconfig'
 require 'sekka/sekkaversion'
-require 'memcache'
 
 module SekkaServer
   class Server
@@ -67,24 +66,7 @@ module SekkaServer
                                                       SekkaServer::Config.dictSource,
                                                       SekkaServer::Config.cacheSource )
 
-      # connection check to memcached
-      fail_message = "sekka-server: failed to access memcached.\n"
-      begin
-        @core.flushCacheServer(@initialCachesv)
-      rescue MemCache::MemCacheError
-        STDERR.printf(fail_message)
-        exit(1)
-      rescue Timeout
-        STDERR.printf(fail_message)
-        exit(1)
-      rescue SocketError
-        STDERR.printf(fail_message)
-        exit(1)
-      rescue Errno::ECONNREFUSED
-        STDERR.printf(fail_message)
-        exit(1)
-      end
-      
+      @core.flushCacheServer(@initialCachesv)
       @cachesv = @initialCachesv
       @downTime = DateTime.now
       
@@ -238,8 +220,6 @@ module SekkaServer
                 @core.writeToString(obj)
               end
             end
-          rescue MemCache::MemCacheError
-            result = "sekka-server: memcached server is down (or may be offline)"
           rescue Timeout
             result = "sekka-server: Timeout to request memcached server #{_orRedis} (or may be offline)"
           rescue SocketError

data/warbler/.bundle/.gitignore

@@ -0,0 +1 @@
+/config

data/warbler/.gitignore

@@ -0,0 +1,5 @@
+/lib
+/sekka-server-1.7.1.jar
+/sekka-server-1.8.0.jar
+/sekka-server.jar
+/vendor

data/warbler/Gemfile

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+source "https://rubygems.org"
+
+gem "warbler", "1.4.10"
+gem "eventmachine"
+gem "distributed-trie"
+gem "memcachepod"
+gem "nendo"
+gem "json"
+gem "ruby-progressbar"
+gem "rack"

data/warbler/Gemfile.lock

@@ -0,0 +1,41 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    RubyInline (3.12.4)
+      ZenTest (~> 4.3)
+    ZenTest (4.11.1)
+    distributed-trie (0.8.0)
+      fuzzy-string-match (>= 0.9.3)
+    eventmachine (1.2.3-java)
+    fuzzy-string-match (1.0.1)
+      RubyInline (>= 3.8.6)
+    jruby-jars (1.7.27)
+    jruby-rack (1.1.20)
+    json (2.1.0-java)
+    memcachepod (0.0.2)
+    nendo (0.8.0)
+    rack (1.6.8)
+    rake (12.0.0)
+    ruby-progressbar (1.8.1)
+    rubyzip (1.2.1)
+    warbler (1.4.10)
+      jruby-jars (>= 1.5.6, < 2.0)
+      jruby-rack (>= 1.1.1, < 1.3)
+      rake (>= 0.9.6)
+      rubyzip (>= 0.9, < 1.3)
+
+PLATFORMS
+  java
+
+DEPENDENCIES
+  distributed-trie
+  eventmachine
+  json
+  memcachepod
+  nendo
+  rack
+  ruby-progressbar
+  warbler (= 1.4.10)
+
+BUNDLED WITH
+   1.15.3

data/warbler/Makefile

@@ -0,0 +1,18 @@
+
+VERSION := $(shell ruby -I ../lib -rsekka/sekkaversion.rb -e 'puts SekkaVersion.version')
+
+sekka-server.jar : ./app/sekka-server.rb bin/init.rb Makefile
+	rm -rf ./lib
+	mkdir -p ./lib
+	cp -r ../lib/* ./lib
+	bundle exec warble jar .
+	/bin/cp sekka-server.jar sekka-server-${VERSION}.jar  
+
+./app/sekka-server.rb : ../bin/sekka-server
+	cp -f ../bin/sekka-server ./app/sekka-server.rb 
+
+rackup:
+	java -jar sekka-server.jar
+
+bundle:
+	bundle install --path vendor/bundle

data/warbler/app/.gitignore

@@ -0,0 +1 @@
+/sekka-server.rb

data/warbler/bin/.gitignore

@@ -0,0 +1 @@
+/sekka-server.rb

data/warbler/bin/init.rb

@@ -0,0 +1,27 @@
+# coding: utf-8
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../"))
+$LOAD_PATH.unshift(File.expand_path(File.dirname(__FILE__) + "/../app/"))
+ 
+Dir.glob(File.expand_path('vendor/bundle/jruby/*/gems/*/lib')).each{|path|
+  $LOAD_PATH << path if !$LOAD_PATH.include?(path)
+}
+ 
+java_import 'java.lang.System'
+java_import 'javax.swing.JOptionPane'
+
+def console_exist?
+  console = System.console()
+  if console.nil?
+    false
+  else
+    true
+  end
+end
+
+if console_exist?
+  ENV.delete('SEKKA_DB')
+  require 'app/sekka-server'
+else
+  require 'sekka/sekkaversion.rb'
+  JOptionPane.showMessageDialog(nil, 'consoleが存在しません。 コンソールで java -jar sekka-server-' + SekkaVersion.version + '.jar を実行してください')
+end

data/warbler/config/warble.rb

@@ -0,0 +1,183 @@
+# Disable Rake-environment-task framework detection by uncommenting/setting to false
+# Warbler.framework_detection = false
+
+# Warbler web application assembly configuration file
+Warbler::Config.new do |config|
+  # Features: additional options controlling how the jar is built.
+  # Currently the following features are supported:
+  # - gemjar: package the gem repository in a jar file in WEB-INF/lib
+  # - executable: embed a web server and make the war executable
+  # - compiled: compile .rb files to .class files
+  # config.features = %w(gemjar)
+
+  # Application directories to be included in the webapp.
+  config.dirs = %w(bin config app lib)
+
+  # Additional files/directories to include, above those in config.dirs
+  # config.includes = FileList["db"]
+
+  # Additional files/directories to exclude
+  # config.excludes = FileList["lib/tasks/*"]
+
+  # Additional Java .jar files to include.  Note that if .jar files are placed
+  # in lib (and not otherwise excluded) then they need not be mentioned here.
+  # JRuby and JRuby-Rack are pre-loaded in this list.  Be sure to include your
+  # own versions if you directly set the value
+  # config.java_libs += FileList["lib/java/*.jar"]
+
+  # Loose Java classes and miscellaneous files to be included.
+  # config.java_classes = FileList["target/classes/**.*"]
+
+  # One or more pathmaps defining how the java classes should be copied into
+  # the archive. The example pathmap below accompanies the java_classes
+  # configuration above. See http://rake.rubyforge.org/classes/String.html#M000017
+  # for details of how to specify a pathmap.
+  # config.pathmaps.java_classes << "%{target/classes/,}p"
+
+  # Bundler support is built-in. If Warbler finds a Gemfile in the
+  # project directory, it will be used to collect the gems to bundle
+  # in your application. If you wish to explicitly disable this
+  # functionality, uncomment here.
+  # config.bundler = false
+
+  # An array of Bundler groups to avoid including in the war file.
+  # Defaults to ["development", "test", "assets"].
+  # config.bundle_without = []
+
+  # Other gems to be included. If you don't use Bundler or a gemspec
+  # file, you need to tell Warbler which gems your application needs
+  # so that they can be packaged in the archive.
+  # For Rails applications, the Rails gems are included by default
+  # unless the vendor/rails directory is present.
+  # config.gems += ["activerecord-jdbcmysql-adapter", "jruby-openssl"]
+  # config.gems << "tzinfo"
+
+  # Uncomment this if you don't want to package rails gem.
+  # config.gems -= ["rails"]
+
+  # The most recent versions of gems are used.
+  # You can specify versions of gems by using a hash assignment:
+  # config.gems["rails"] = "2.3.10"
+
+  # You can also use regexps or Gem::Dependency objects for flexibility or
+  # finer-grained control.
+  # config.gems << /^merb-/
+  # config.gems << Gem::Dependency.new("merb-core", "= 0.9.3")
+
+  # Include gem dependencies not mentioned specifically. Default is
+  # true, uncomment to turn off.
+  # config.gem_dependencies = false
+
+  # Array of regular expressions matching relative paths in gems to be
+  # excluded from the war. Defaults to empty, but you can set it like
+  # below, which excludes test files.
+  # config.gem_excludes = [/^(test|spec)\//]
+
+  # Pathmaps for controlling how application files are copied into the archive
+  # config.pathmaps.application = ["WEB-INF/%p"]
+
+  # Name of the archive (without the extension). Defaults to the basename
+  # of the project directory.
+  config.jar_name = "sekka-server"
+
+  # File extension for the archive. Defaults to either 'jar' or 'war'.
+  # config.jar_extension = "jar"
+
+  # Destionation for the created archive. Defaults to project's root directory.
+  # config.autodeploy_dir = "dist/"
+
+  # Name of the MANIFEST.MF template for the war file. Defaults to a simple
+  # MANIFEST.MF that contains the version of Warbler used to create the war file.
+  # config.manifest_file = "config/MANIFEST.MF"
+
+  # When using the 'compiled' feature and specified, only these Ruby
+  # files will be compiled. Default is to compile all \.rb files in
+  # the application.
+  # config.compiled_ruby_files = FileList['app/**/*.rb']
+
+  # Determines if ruby files in supporting gems will be compiled.
+  # Ignored unless compile feature is used.
+  # config.compile_gems = false
+
+  # When set it specify the bytecode version for compiled class files
+  # config.bytecode_version = "1.6"
+
+  # When set to true, Warbler will override the value of ENV['GEM_HOME'] even it
+  # has already been set. When set to false it will use any existing value of
+  # GEM_HOME if it is set.
+  # config.override_gem_home = true
+
+  # Allows for specifing custom executables
+  # config.executable = ["rake", "bin/rake"]
+
+  # Sets default (prefixed) parameters for the executables
+  # config.executable_params = "do:something"
+
+  # If set to true, moves jar files into WEB-INF/lib. Prior to version 1.4.2 of Warbler this was done
+  # by default. But since 1.4.2 this config defaults to false. It may need to be set to true for
+  # web servers that do not explode the WAR file.
+  # Alternatively, this option can be set to a regular expression, which will
+  # act as a jar selector -- only jar files that match the pattern will be 
+  # included in the archive.
+  # config.move_jars_to_webinf_lib = false
+
+  # === War files only below here ===
+
+  # Path to the pre-bundled gem directory inside the war file. Default
+  # is 'WEB-INF/gems'. Specify path if gems are already bundled
+  # before running Warbler. This also sets 'gem.path' inside web.xml.
+  # config.gem_path = "WEB-INF/vendor/bundler_gems"
+
+  # Files for WEB-INF directory (next to web.xml). This contains
+  # web.xml by default. If there is an .erb-File it will be processed
+  # with webxml-config. You may want to exclude this file via
+  # config.excludes.
+  # config.webinf_files += FileList["jboss-web.xml"]
+
+  # Files to be included in the root of the webapp.  Note that files in public
+  # will have the leading 'public/' part of the path stripped during staging.
+  # config.public_html = FileList["public/**/*", "doc/**/*"]
+
+  # Pathmaps for controlling how public HTML files are copied into the .war
+  # config.pathmaps.public_html = ["%{public/,}p"]
+
+  # Embedded webserver to use with the 'executable' feature. Currently supported
+  # webservers are:
+  # * <tt>winstone</tt> (default) - Winstone 0.9.10 from sourceforge
+  # * <tt>jenkins-ci.winstone</tt> - Improved Winstone from Jenkins CI
+  # * <tt>jetty</tt> - Embedded Jetty from Eclipse
+  # config.webserver = 'jetty'
+
+  # Value of RAILS_ENV for the webapp -- default as shown below
+  # config.webxml.rails.env = ENV['RAILS_ENV'] || 'production'
+
+  # Application booter to use, one of :rack, :rails, or :merb (autodetected by default)
+  # config.webxml.booter = :rails
+
+  # Set JRuby to run in 1.9 mode.
+  # config.webxml.jruby.compat.version = "1.9"
+
+  # When using the :rack booter, "Rackup" script to use.
+  # - For 'rackup.path', the value points to the location of the rackup
+  # script in the web archive file. You need to make sure this file
+  # gets included in the war, possibly by adding it to config.includes
+  # or config.webinf_files above.
+  # - For 'rackup', the rackup script you provide as an inline string
+  #   is simply embedded in web.xml.
+  # The script is evaluated in a Rack::Builder to load the application.
+  # Examples:
+  # config.webxml.rackup.path = 'WEB-INF/hello.ru'
+  # config.webxml.rackup = %{require './lib/demo'; run Rack::Adapter::Camping.new(Demo)}
+  # config.webxml.rackup = require 'cgi' && CGI::escapeHTML(File.read("config.ru"))
+
+  # Control the pool of Rails runtimes. Leaving unspecified means
+  # the pool will grow as needed to service requests. It is recommended
+  # that you fix these values when running a production server!
+  # If you're using threadsafe! mode, you probably don't want to set these values,
+  # since 1 runtime(default for threadsafe mode) will be enough.
+  # config.webxml.jruby.min.runtimes = 2
+  # config.webxml.jruby.max.runtimes = 4
+
+  # JNDI data source name
+  # config.webxml.jndi = 'jdbc/rails'
+end

metadata

@@ -1,128 +1,129 @@
 --- !ruby/object:Gem::Specification
 name: sekka
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.8.0
 platform: ruby
 authors:
 - Kiyoka Nishiyama
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-07-25 00:00:00.000000000 Z
+date: 2017-08-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: eventmachine
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
-  name: eventmachine
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
+  name: memcache-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
-  name: memcache-client
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.8'
 - !ruby/object:Gem::Dependency
+  name: nendo
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
-  name: nendo
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
+  name: distributed-trie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.0
-  name: distributed-trie
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
         version: 0.8.0
 - !ruby/object:Gem::Dependency
+  name: rack
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: rack
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
+  name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
-  name: ruby-progressbar
-  prerelease: false
   type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.4'
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.7'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '10.0'
-description: Sekka is a SKK like input method. Sekka server provides REST Based API. If you are SKK user, let's try it.
+description: Sekka is a SKK like input method. Sekka server provides REST Based API.
+  If you are SKK user, let's try it.
 email:
 - kiyoka@sumibi.org
 executables:
@@ -249,11 +250,20 @@ files:
 - tool/MapDBImpoter/.classpath
 - tool/MapDBImpoter/.project
 - tool/MapDBImpoter/src/MapDBImporter.java
+- warbler/.bundle/.gitignore
+- warbler/.gitignore
+- warbler/Gemfile
+- warbler/Gemfile.lock
+- warbler/Makefile
+- warbler/app/.gitignore
+- warbler/bin/.gitignore
+- warbler/bin/init.rb
+- warbler/config/warble.rb
 homepage: http://github.com/kiyoka/sekka
 licenses:
 - New BSD
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -268,9 +278,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.4.8
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.6.11
+signing_key: 
 specification_version: 4
 summary: Sekka is a SKK like input method.
 test_files: