opener-opinion-detector-basic 1.0.3 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 173429b1415402fbd4d6c14010d3706a95dc3c70
-  data.tar.gz: febe0e858ba5af068ed9c5bf242f098223ad133a
+  metadata.gz: e80ffdd5115c32d50d5a280b724dd882c8085693
+  data.tar.gz: 5659d0a91f0cd35f828ac7e33a209c590895ba14
 SHA512:
-  metadata.gz: 746417484cd6597a9df72938f8d020a9d4ef38a492d0e475881b12b068c832096f6ed96c9fd93668034391cc14015ea504a72baf827160b119de748c06c18b12
-  data.tar.gz: 3ce4ff9e02b75daeedf3757459545919efed36b64c1a6cdbaf2e7546ec82fca5c051ff8be5cc0530359224ba5dee38d07bfed412cae0b16eb42726de6a30c556
+  metadata.gz: a4675e8f27594e1b1a3ff5ca2ae69714166aafc9934b3fcb4ced17efb809ddfe5f7db159aba0e89bce46f0c075eb56ee5f245b434bc85f77ec14794cb51e279a
+  data.tar.gz: 67934dad4130615732d453b20a6a1a686ff63ecb13bd3739b43c52a1a3d4131b0db601447a01a34ca883f2944bd8b92f33e4940e9fb960daf0bf29c23d9794c4

data/ext/hack/Rakefile

@@ -1,18 +1,10 @@
-require 'rake'
-require_relative 'support'
-
-desc 'Verifies the requirements'
-task :requirements do
-  verify_requirements
-  require_executable("make")
-end
-
-task :compile => :requirements do
-  compile_vendored_code
-end
-
-task :default => [:compile] do
-   path = File.join(PYTHON_SITE_PACKAGES, 'pre_install')
-
-   pip_install(PRE_INSTALL_REQUIREMENTS, path)
+import File.expand_path('../../../task/requirements.rake', __FILE__)
+import File.expand_path('../../../task/c.rake', __FILE__)
+import File.expand_path('../../../task/python.rake', __FILE__)
+
+task :default => :requirements do
+  Dir.chdir(File.expand_path('../../../', __FILE__)) do
+    Rake::Task['c:compile'].invoke
+    Rake::Task['core/site-packages/pre_install'].invoke
+  end
 end

data/lib/opener/opinion_detector_basic/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class OpinionDetectorBasic
-    VERSION = "1.0.3"
+    VERSION = "1.0.4"
   end
 end

data/opener-opinion-detector-basic.gemspec

@@ -12,7 +12,6 @@ Gem::Specification.new do |gem|
   gem.required_ruby_version = '>= 1.9.2'
 
   gem.files = Dir.glob([
-    'core/packages/*',
     'core/vendor/src/**/*',
     'core/*',
     'ext/**/*',
@@ -21,12 +20,12 @@ Gem::Specification.new do |gem|
     '*.gemspec',
     '*_requirements.txt',
     'README.md',
-    'exec/**/*'
+    'exec/**/*',
+    'task/*'
   ]).select { |file| File.file?(file) }
 
   gem.executables = Dir.glob('bin/*').map { |file| File.basename(file) }
 
-  gem.add_dependency 'opener-build-tools', ['>= 0.2.7']
   gem.add_dependency 'rake'
   gem.add_dependency 'sinatra'
   gem.add_dependency 'httpclient'
@@ -35,7 +34,8 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-core', ['>= 0.1.2']
   gem.add_dependency 'opener-webservice'
   gem.add_dependency 'nokogiri'
+  gem.add_dependency 'cliver'
 
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'cucumber'
 end

data/task/c.rake

@@ -0,0 +1,36 @@
+build_dir = File.expand_path('../../core/vendor/build', __FILE__)
+bin_dir   = File.join(build_dir, 'bin')
+
+# Names of the various files to build. We're using variables here since they're
+# a bit too painful to type multiple times.
+liblbfgs     = "core/vendor/build/lib/liblbfgs.#{RbConfig::CONFIG['DLEXT']}"
+crfsuite     = 'core/vendor/build/bin/crfsuite'
+svm_classify = 'core/vendor/build/bin/svm_classify'
+svm_learn    = 'core/vendor/build/bin/svm_learn'
+
+file liblbfgs do
+  Dir.chdir('core/vendor/src/liblbfgs') do
+    sh "./configure --prefix=#{build_dir}"
+    sh 'make && make install && make distclean'
+  end
+end
+
+file crfsuite => liblbfgs do
+  Dir.chdir('core/vendor/src/crfsuite') do
+    sh "./configure --prefix=#{build_dir} --with-liblbfgs=#{build_dir}"
+    sh 'make && make install && make distclean'
+  end
+end
+
+file svm_classify do
+  Dir.chdir('core/vendor/src/svm_light') do
+    sh 'make'
+    sh "cp -f svm_classify svm_learn #{bin_dir}"
+    sh 'make clean'
+  end
+end
+
+namespace :c do
+  desc 'Compiles the vendored C code'
+  task :compile => [crfsuite, svm_classify]
+end

data/task/compile.rake

@@ -0,0 +1,2 @@
+desc 'Verifies requirements and compiles the core'
+task :compile => ['requirements', 'c:compile', 'python:compile']

data/task/python.rake

@@ -0,0 +1,11 @@
+# NOTE: pre_build/pre_install directories are created by pip.
+
+directory 'core/site-packages/pre_install' do |task|
+  sh "pip install --requirement=pre_install_requirements.txt " \
+    "--target=#{task.name} --ignore-installed"
+end
+
+namespace :python do
+  desc 'Installs Python packages in a local directory'
+  task :compile => ['core/site-packages/pre_install']
+end

data/task/requirements.rake

@@ -0,0 +1,8 @@
+desc 'Verifies the requirements'
+task :requirements do
+  require 'cliver'
+
+  Cliver.detect!('make')
+  Cliver.detect!('python', '~> 2.7')
+  Cliver.detect!('pip', '~> 1.3')
+end

data/task/submodules.rake

@@ -0,0 +1,5 @@
+desc 'Updates the Git submodules'
+task :submodules do
+  sh 'git submodule init'
+  sh 'git submodule update'
+end

data/task/test.rake

@@ -0,0 +1,4 @@
+desc 'Runs the tests'
+task :test => :compile do
+  sh('cucumber features')
+end

metadata

@@ -1,175 +1,175 @@
 --- !ruby/object:Gem::Specification
 name: opener-opinion-detector-basic
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.0.4
 platform: ruby
 authors:
 - development@olery.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
 date: 2014-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: opener-build-tools
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: 0.2.7
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.2.7
-  prerelease: false
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sinatra
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: sinatra
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: httpclient
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: httpclient
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: puma
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: opener-daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: opener-daemons
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: opener-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: 0.1.2
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: opener-core
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
+- !ruby/object:Gem::Dependency
+  name: opener-webservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
-  prerelease: false
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: opener-webservice
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: nokogiri
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: cliver
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rspec
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: '3.0'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: cucumber
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: cucumber
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Basic Opinion Detector.
-email:
+email: 
 executables:
+- opinion-detector-basic-server
 - opinion-detector-basic
 - opinion-detector-basic-daemon
-- opinion-detector-basic-server
 extensions:
 - ext/hack/Rakefile
 extra_rdoc_files: []
@@ -320,7 +320,6 @@ files:
 - core/vendor/src/svm_light/svm_loqo.c
 - exec/opinion-detector-basic.rb
 - ext/hack/Rakefile
-- ext/hack/support.rb
 - lib/opener/opinion_detector_basic.rb
 - lib/opener/opinion_detector_basic/error_layer.rb
 - lib/opener/opinion_detector_basic/public/markdown.css
@@ -330,27 +329,34 @@ files:
 - lib/opener/opinion_detector_basic/views/result.erb
 - opener-opinion-detector-basic.gemspec
 - pre_install_requirements.txt
+- task/c.rake
+- task/compile.rake
+- task/python.rake
+- task/requirements.rake
+- task/submodules.rake
+- task/test.rake
 homepage: http://opener-project.github.com/
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
+rubyforge_project: 
 rubygems_version: 2.2.2
-signing_key:
+signing_key: 
 specification_version: 4
 summary: Basic Opinion Detector.
 test_files: []
+has_rdoc: 

data/ext/hack/support.rb

@@ -1,88 +0,0 @@
-require 'opener/build-tools'
-
-include Opener::BuildTools::Requirements
-include Opener::BuildTools::Python
-include Opener::BuildTools::Files
-
-# Directory of the core
-CORE_DIR = File.expand_path('../../../core', __FILE__)
-
-# Directory where packages will be installed to.
-PYTHON_SITE_PACKAGES = File.expand_path(
-  '../../../core/site-packages',
-  __FILE__
-)
-
-# Directory containing the temporary files.
-TMP_DIRECTORY = File.expand_path('../../../tmp', __FILE__)
-
-# Path to the pip requirements file used to install requirements before
-# packaging the Gem.
-PRE_BUILD_REQUIREMENTS = File.expand_path(
-  '../../../pre_build_requirements.txt',
-  __FILE__
-)
-
-# Path to the pip requirements file used to install requirements upon Gem
-# installation.
-PRE_INSTALL_REQUIREMENTS = File.expand_path(
-  '../../../pre_install_requirements.txt',
-  __FILE__
-)
-
-# Path to the vendor directory for C code.
-VENDOR_DIRECTORY = File.expand_path('../../../core/vendor', __FILE__)
-
-# Path to the directory to install vendored C code into.
-VENDOR_BUILD_DIRECTORY = File.expand_path(
-  '../../../core/vendor/build',
-  __FILE__
-)
-
-# Path to the directory that contains the source C code to compile.
-VENDOR_SRC_DIRECTORY = File.expand_path('../../../core/vendor/src', __FILE__)
-
-
-##
-# Verifies the requirements to install thi Gem.
-#
-def verify_requirements
-  require_executable('python')
-  require_version('python', python_version, '2.6.0')
-  require_executable('pip')
-  require_version('pip', pip_version, '1.3.1')
-end
-
-##
-# Compiles C code in the current directory using `make`.
-#
-# @param [Array] args The arguments to pass to ./configure
-#
-def compile(*args)
-  sh "./configure #{args.join(' ')}"
-  sh 'make'
-  sh 'make install'
-  sh 'make distclean'
-end
-
-##
-# Compiles the C code found in src/vendor.
-#
-def compile_vendored_code
-  src   = VENDOR_SRC_DIRECTORY
-  build = VENDOR_BUILD_DIRECTORY
-
-  Dir.chdir(File.join(src, "liblbfgs")) do
-    compile("--prefix=#{build}")
-  end
-
-  Dir.chdir(File.join(src, "crfsuite")) do
-    compile("--prefix=#{build}", "--with-liblbfgs=#{build}")
-  end
-
-  Dir.chdir(File.join(src, "svm_light")) do
-    sh 'make'
-    sh 'mv svm_classify svm_learn ../../build/bin'
-    sh 'make clean'
-  end
-end