opener-property-tagger 2.2.5 → 2.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 330d2b48043b775164c8d591c6375a635078379b
-  data.tar.gz: 6ec3726a0d0b5342ec0aa9cbf24604eee6ce859d
+  metadata.gz: 09164885c23af856ce81b5772ba39598d23bb340
+  data.tar.gz: 5b655422574199ab7a859860e6f7081b96cf1e33
 SHA512:
-  metadata.gz: 4ea252305fa34042b7294b9fd0bbf2bb1bcf5e238c9ec359003ef6ae9f7c9b3712919467c348c352bf1230078d07b356b3245c282bf88b2d10ce1dcd9ae35fd9
-  data.tar.gz: dab4d0eacb541aa0ce0fdc6e6a360588c06339cf5617cce48f5e214ffe6625ad4677f7cd285592088b43e8e7e0e4a3e4c364c266044b26b0921ecaa68d6044a9
+  metadata.gz: 38752d338667ffaeddb1331a01898a2a18d7b36f9a9a33dae7fdf3f89cec17500a2c32f5b688fc1eb845ed5a0aa59257dc1941ad55ad5ed9b634a2096af6b3ce
+  data.tar.gz: 4db298e672eb943a9724756d5486ab048a84661997f7c83ce22056024412f61e0ceff74cbf01971293712309831c500f6d8a02aa185413b4ae08a17897ee30b5

data/ext/hack/Rakefile

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

data/lib/opener/property_tagger/cli.rb

@@ -54,17 +54,7 @@ module Opener
 
         tagger = PropertyTagger.new(options)
 
-        stdout, stderr, process = tagger.run(input)
-
-        if process.success?
-          puts stdout
-
-          if options[:logging] and !stderr.empty?
-            STDERR.puts(stderr)
-          end
-        else
-          abort stderr
-        end
+        puts tagger.run(input)
       end
 
       private

data/lib/opener/property_tagger/version.rb

@@ -1,5 +1,5 @@
 module Opener
   class PropertyTagger
-    VERSION = '2.2.5'
+    VERSION = '2.2.6'
   end # PropertyTagger
 end # Opener

data/opener-property-tagger.gemspec

@@ -13,20 +13,21 @@ Gem::Specification.new do |gem|
 
   gem.files = Dir.glob([
     'core/data/**/*',
-    'core/*',
+    'core/*.py',
     'ext/**/*',
     'lib/**/*',
     'config.ru',
     '*.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', ['>= 1.0.1']
   gem.add_dependency 'rake'
+  gem.add_dependency 'cliver'
   gem.add_dependency 'sinatra'
   gem.add_dependency 'httpclient'
   gem.add_dependency 'puma'
@@ -35,6 +36,6 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'opener-core', ['>= 0.1.2']
   gem.add_dependency 'nokogiri'
 
-  gem.add_development_dependency 'rspec'
+  gem.add_development_dependency 'rspec', '~> 3.0'
   gem.add_development_dependency 'cucumber'
 end

data/task/compile.rake

@@ -0,0 +1,2 @@
+desc 'Verifies requirements and compiles the core'
+task :compile => ['requirements', '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,7 @@
+desc 'Verifies the requirements'
+task :requirements do
+  require 'cliver'
+
+  Cliver.detect!('python', '~> 2.6')
+  Cliver.detect!('pip', '~> 1.3')
+end

data/task/test.rake

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

metadata

@@ -1,171 +1,171 @@
 --- !ruby/object:Gem::Specification
 name: opener-property-tagger
 version: !ruby/object:Gem::Version
-  version: 2.2.5
+  version: 2.2.6
 platform: ruby
 authors:
 - development@olery.com
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-12 00:00:00.000000000 Z
+date: 2014-06-16 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: 1.0.1
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.1
-  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: cliver
   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: sinatra
   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: httpclient
   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: puma
   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-daemons
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   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: opener-webservice
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   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
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: opener-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.2
-  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'
+        version: 0.1.2
+- !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: 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: Property tagger for hotels in Dutch and English.
-email:
+email: 
 executables:
 - property-tagger
 - property-tagger-daemon
@@ -183,7 +183,6 @@ files:
 - core/hotel_property_tagger_nl_en.py
 - exec/property-tagger.rb
 - ext/hack/Rakefile
-- ext/hack/support.rb
 - lib/opener/property_tagger.rb
 - lib/opener/property_tagger/cli.rb
 - lib/opener/property_tagger/error_layer.rb
@@ -194,27 +193,32 @@ files:
 - lib/opener/property_tagger/views/result.erb
 - opener-property-tagger.gemspec
 - pre_install_requirements.txt
+- task/compile.rake
+- task/python.rake
+- task/requirements.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: Property tagger for hotels in Dutch and English.
 test_files: []
+has_rdoc: 

data/ext/hack/support.rb

@@ -1,38 +0,0 @@
-require 'opener/build-tools'
-
-include Opener::BuildTools::Requirements
-include Opener::BuildTools::Python
-include Opener::BuildTools::Files
-
-# 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__
-)
-
-##
-# 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