llt 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2ccb32177fa1ff3b9fa5848091de6d25b216fbb9
-  data.tar.gz: 2ee96867590cbc182a24391b6d80281a84b2d534
+  metadata.gz: 604ec9b36e98e069903541a98acf14696dac8fd0
+  data.tar.gz: e831fa21d882c0e9b6cfc8dc4445aaa8410d6267
 SHA512:
-  metadata.gz: 5c273d62ad5ec5a4f5a535625896557b8e89f77962979c8662ded57e2a50b53dfcfecf36b6e1daa607cb9655c02cc2d22f6ac02edaef5fd8d19a5b0e9b61c69a
-  data.tar.gz: c4ff43c1ac7fa98d12b97dec1b0e3d9af36ec6a0e3503fa6c2695d5f69f33954850844ddb5c35f62dd51eec71077d9237610658121db55b4c6ccff04c62ee188
+  metadata.gz: 9f5f687c5a7f8e7b9ead461bf727d5330c39a894ad390459ecb0af9e7ed390bb040be8289024cc20fe2bfcab767221eeaccee7776a823657bdd57ab404915e91
+  data.tar.gz: f5a2e4c97a04f11651874046a7688707b03ce4529bcde4f254978ffdc83d86d6d94a4b45140d4cbe9e4e5af5f94c92adddde4de073a1cd1b4221bb81003129d9

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 *.rbc
+*.war
 .bundle
 .config
 .yardoc

data/Gemfile

@@ -5,17 +5,17 @@ gemspec
 
 gem 'coveralls', require: false
 
-gem 'llt-core', git: 'https://github.com/latin-language-toolkit/llt-core.git'
-gem 'llt-constants', git: 'https://github.com/latin-language-toolkit/llt-constants.git'
-gem 'llt-db_handler', git: 'https://github.com/latin-language-toolkit/llt-db_handler.git'
-gem 'llt-helpers', git: 'https://github.com/latin-language-toolkit/llt-helpers.git'
-gem 'llt-logger', git: 'https://github.com/latin-language-toolkit/llt-logger.git'
-gem 'llt-segmenter', git: 'https://github.com/latin-language-toolkit/llt-segmenter.git'
-gem 'llt-tokenizer', git: 'https://github.com/latin-language-toolkit/llt-tokenizer.git'
+gem 'llt-core', git: 'git://github.com/latin-language-toolkit/llt-core.git'
+gem 'llt-constants', git: 'git://github.com/latin-language-toolkit/llt-constants.git'
+gem 'llt-db_handler', git: 'git://github.com/latin-language-toolkit/llt-db_handler.git'
+gem 'llt-helpers', git: 'git://github.com/latin-language-toolkit/llt-helpers.git'
+gem 'llt-logger', git: 'git://github.com/latin-language-toolkit/llt-logger.git'
+gem 'llt-segmenter', git: 'git://github.com/latin-language-toolkit/llt-segmenter.git'
+gem 'llt-tokenizer', git: 'git://github.com/latin-language-toolkit/llt-tokenizer.git'
 
 # Dependencies of db_handler
-gem 'llt-core_extensions', git: 'https://github.com/latin-language-toolkit/llt-core_extensions.git'
-gem 'llt-form_builder', git: 'https://github.com/latin-language-toolkit/llt-form_builder.git'
+gem 'llt-core_extensions', git: 'git://github.com/latin-language-toolkit/llt-core_extensions.git'
+gem 'llt-form_builder', git: 'git://github.com/latin-language-toolkit/llt-form_builder.git'
 
 platform :ruby do
   gem 'pg'

data/bin/llt

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+
+lib = File.expand_path('../../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
+require 'llt/cli'
+LLT::CLI.start

data/bin/rackup

@@ -0,0 +1,16 @@
+#!/usr/bin/env jruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rackup' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rack', 'rackup')

data/config.ru

@@ -1,3 +1,6 @@
+lib = File.expand_path('../lib', __FILE__)
+$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+
 require 'llt/api'
 use ActiveRecord::ConnectionAdapters::ConnectionManagement
 run Api

data/config/warble.rb

@@ -0,0 +1,19 @@
+# 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|
+  # We are using the gemspec instead, as the Gemfile itself is
+  # pointing to edge versions of dependent gems. It also seems
+  # that warbler has all kinds of troubles when pulling in gems
+  # from git...
+  config.bundler = false
+
+  # These gems are jruby only, we cannot include them in the gemspecs, as they
+  # would break MRI compatibility.
+  config.gems << 'activerecord-jdbcpostgresql-adapter'
+  config.gems << 'jruby-httpclient'
+
+  # Set JRuby to run in 2.0 mode.
+  config.webxml.jruby.compat.version = "2.0"
+end

data/lib/llt/cli.rb

@@ -0,0 +1,60 @@
+require 'thor'
+require 'bundler'
+
+module LLT
+  class CLI < Thor
+    include Thor::Actions
+
+    BASE_DIR = File.expand_path('../../..', __FILE__)
+
+    desc 'deploy', 'deploys llt as war after updating all llt gems'
+    method_option :tomcat, aliases: '-t',
+      desc: 'path to Tomcat directory to copy the war file to'
+    method_option :restart_server, type: :boolean, aliases: '-r',
+      desc: 'Works only when -t is given'
+    def deploy
+      inside BASE_DIR do
+        update_gems(llt_gems)
+        run_warbler
+        deploy_to_tomcat(options)
+      end
+    end
+
+    no_commands do
+      def llt_gems
+        File.read('Gemfile').each_line.with_object([]) do |line, arr|
+          arr << $1 if line.match(/^gem '(llt-.*?)'/)
+        end
+      end
+
+      def update_gems(gems)
+        say_status('updating', '')
+        gem_list = `gem list`
+        to_update, to_install = gems.partition { |gem| gem_list.match(/#{gem}/)}
+        system "gem install #{to_install.join(' ')}" if to_install.any?
+        system "gem update #{to_update.join(' ')}"
+      end
+
+      def run_warbler
+        say_status('warbling', '')
+        Bundler.with_clean_env { system 'warble' }
+      end
+
+      def deploy_to_tomcat(options)
+        if tomcat = options[:tomcat]
+          app_dir = File.join(tomcat, 'webapps')
+          say_status(:copying, "llt.war => #{app_dir}")
+          system("cp llt.war #{app_dir}")
+          restart(tomcat) if options[:restart_server]
+        end
+      end
+
+      def restart(tomcat)
+        bin_dir = File.join(tomcat, 'bin')
+        say_status(:restarting, '')
+        system("#{bin_dir}/shutdown.sh")
+        system("#{bin_dir}/startup.sh")
+      end
+    end
+  end
+end

data/lib/llt/version.rb

@@ -1,3 +1,3 @@
 module LLT
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/llt.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "simplecov", "~> 0.7"
   spec.add_dependency "llt-segmenter"
   spec.add_dependency "llt-tokenizer"
+  spec.add_dependency "thor"
 end

metadata

@@ -1,116 +1,136 @@
 --- !ruby/object:Gem::Specification
 name: llt
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - LFDM, christof, lichtr
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-08 00:00:00.000000000 Z
+date: 2014-01-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  requirement: !ruby/object:Gem::Requirement
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
-  prerelease: false
-  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  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
   type: :development
-- !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: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  prerelease: false
+        version: '0.7'
   type: :development
-- !ruby/object:Gem::Dependency
-  name: simplecov
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: llt-segmenter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '0'
+  type: :runtime
   prerelease: false
-  type: :development
-- !ruby/object:Gem::Dependency
-  name: llt-segmenter
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: llt-tokenizer
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: llt-tokenizer
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: LLT meta gem
 email:
 - 1986gh@gmail.com
-executables: []
+executables:
+- llt
+- rackup
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rspec
-- .travis.yml
+- ".gitignore"
+- ".rspec"
+- ".travis.yml"
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
+- bin/llt
+- bin/rackup
 - config.ru
+- config/warble.rb
 - lib/llt.rb
 - lib/llt/api.rb
+- lib/llt/cli.rb
 - lib/llt/version.rb
 - llt.gemspec
 - spec/lib/llt/api_spec.rb
@@ -120,24 +140,24 @@ homepage: ''
 licenses:
 - MIT
 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: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project:
-rubygems_version: 2.1.9
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.2.0
+signing_key: 
 specification_version: 4
 summary: LLT meta gem
 test_files: