hyperflow-amqp-executor 1.0.0 → 1.0.1.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa8e10ac439e7a475bd1a019a7bf9b911238a648
-  data.tar.gz: 50c7432942f8e4c29ecd3039ceb54c2a81ccbfbc
+  metadata.gz: 250d783db96d49b108b75e9de00657ddaa77ae6e
+  data.tar.gz: 47ce4eebc10725cffeef2197242aa47e80e93ec0
 SHA512:
-  metadata.gz: 3aa7281cea2f3ff3e7dd9f164d4fe27bf798e85ce706c107c9fcf662733c0789b9ef03484597ef656669d1405de1cdb31281e0ebecdd9639258f4ad8769d6bf7
-  data.tar.gz: c46df737e23a3acca22bac4519b72791b9560fe9321cac81abaa672fa265615ea1b2b845a8f50863140a359c03573eae84eefe88f1c67dcd13092300eb9c9996
+  metadata.gz: d5312d1671a2aadfa01624efbe0a5f9b6a2ab085385e43b60b274e87f8de71ba59086a90365165a3e4b87e715f4fe2e528317e42e5866e438c82c6f07219cea2
+  data.tar.gz: 360968450a77ec7642d3499a9bdd08a6ea7c580b4d0e8685fc1e9b31c27d36a46d4115649a56654a98ce1fda2589aca89938f606183f06b136715487c8490134

data/Gemfile

@@ -1,9 +1,7 @@
 source "https://rubygems.org"
-# Add dependencies required to use your gem here.
 
-#ruby "2.1.0"
-
-gem 'fog', "~> 1.18"
+gem 'fog', "~> 1.30"
+gem 'fog-aws', "~> 0.2"
 gem 'unf', "~> 0.1" # for AWS fog 
 gem 'recursive-open-struct', "~> 0.4"
 gem 'amqp', "~> 1.1"

data/Gemfile.lock

@@ -1,13 +1,13 @@
 GEM
   remote: https://rubygems.org/
   specs:
+    CFPropertyList (2.3.1)
     activesupport (4.2.1)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
       thread_safe (~> 0.3, >= 0.3.4)
       tzinfo (~> 1.1)
-    addressable (2.3.8)
     amq-protocol (1.9.2)
     amqp (1.5.0)
       amq-protocol (>= 1.9.2)
@@ -16,69 +16,133 @@ GEM
     coderay (1.1.0)
     deep_merge (1.0.1)
     eventmachine (1.0.7)
-    excon (0.31.0)
-    faraday (0.8.9)
-      multipart-post (~> 1.2.0)
-    fog (1.19.0)
+    excon (0.45.3)
+    fission (0.5.0)
+      CFPropertyList (~> 2.2)
+    fog (1.30.0)
+      fog-atmos
+      fog-aws (~> 0.0)
+      fog-brightbox (~> 0.4)
+      fog-core (~> 1.27, >= 1.27.4)
+      fog-ecloud
+      fog-google (>= 0.0.2)
+      fog-json
+      fog-local
+      fog-powerdns (>= 0.1.1)
+      fog-profitbricks
+      fog-radosgw (>= 0.0.2)
+      fog-riakcs
+      fog-sakuracloud (>= 0.0.4)
+      fog-serverlove
+      fog-softlayer
+      fog-storm_on_demand
+      fog-terremark
+      fog-vmfusion
+      fog-voxel
+      fog-xml (~> 0.1.1)
+      ipaddress (~> 0.5)
+      nokogiri (~> 1.5, >= 1.5.11)
+    fog-atmos (0.1.0)
+      fog-core
+      fog-xml
+    fog-aws (0.2.2)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+      ipaddress (~> 0.8)
+    fog-brightbox (0.7.1)
+      fog-core (~> 1.22)
+      fog-json
+      inflecto (~> 0.0.2)
+    fog-core (1.30.0)
       builder
-      excon (~> 0.31.0)
-      formatador (~> 0.2.0)
+      excon (~> 0.45)
+      formatador (~> 0.2)
       mime-types
-      multi_json (~> 1.0)
       net-scp (~> 1.1)
       net-ssh (>= 2.1.3)
-      nokogiri (~> 1.5)
-      ruby-hmac
+    fog-ecloud (0.1.1)
+      fog-core
+      fog-xml
+    fog-google (0.0.5)
+      fog-core
+      fog-json
+      fog-xml
+    fog-json (1.0.1)
+      fog-core (~> 1.0)
+      multi_json (~> 1.0)
+    fog-local (0.2.1)
+      fog-core (~> 1.27)
+    fog-powerdns (0.1.1)
+      fog-core (~> 1.27)
+      fog-json (~> 1.0)
+      fog-xml (~> 0.1)
+    fog-profitbricks (0.0.2)
+      fog-core
+      fog-xml
+      nokogiri
+    fog-radosgw (0.0.4)
+      fog-core (>= 1.21.0)
+      fog-json
+      fog-xml (>= 0.0.1)
+    fog-riakcs (0.1.0)
+      fog-core
+      fog-json
+      fog-xml
+    fog-sakuracloud (1.0.1)
+      fog-core
+      fog-json
+    fog-serverlove (0.1.2)
+      fog-core
+      fog-json
+    fog-softlayer (0.4.6)
+      fog-core
+      fog-json
+    fog-storm_on_demand (0.1.1)
+      fog-core
+      fog-json
+    fog-terremark (0.1.0)
+      fog-core
+      fog-xml
+    fog-vmfusion (0.1.0)
+      fission
+      fog-core
+    fog-voxel (0.1.0)
+      fog-core
+      fog-xml
+    fog-xml (0.1.1)
+      fog-core
+      nokogiri (~> 1.5, >= 1.5.11)
     formatador (0.2.5)
     git (1.2.9.1)
-    github_api (0.10.1)
-      addressable
-      faraday (~> 0.8.1)
-      hashie (>= 1.2)
-      multi_json (~> 1.4)
-      nokogiri (~> 1.5.2)
-      oauth2
-    hashie (3.4.1)
-    highline (1.7.2)
     httpclient (2.6.0.1)
     i18n (0.7.0)
-    jeweler (1.8.8)
-      builder
+    inflecto (0.0.2)
+    ipaddress (0.8.0)
+    jeweler (1.8.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
-      github_api (= 0.10.1)
-      highline (>= 1.6.15)
-      nokogiri (= 1.5.10)
       rake
       rdoc
     json (1.8.2)
-    jwt (1.4.1)
     method_source (0.8.2)
     mime-types (2.5)
+    mini_portile (0.6.2)
     minitest (5.6.1)
     multi_json (1.11.0)
-    multi_xml (0.5.5)
-    multipart-post (1.2.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.2)
-    nokogiri (1.5.10)
-    oauth2 (1.0.0)
-      faraday (>= 0.8, < 0.10)
-      jwt (~> 1.0)
-      multi_json (~> 1.3)
-      multi_xml (~> 0.5)
-      rack (~> 1.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.6.0)
     rake (10.4.2)
     rdoc (3.12.2)
       json (~> 1.4)
     recursive-open-struct (0.6.3)
-    ruby-hmac (0.4.0)
     shoulda (3.5.0)
       shoulda-context (~> 1.0, >= 1.0.1)
       shoulda-matchers (>= 1.4.1, < 3.0)
@@ -100,7 +164,8 @@ DEPENDENCIES
   amqp (~> 1.1)
   bundler (~> 1.0)
   deep_merge (~> 1.0)
-  fog (~> 1.18)
+  fog (~> 1.30)
+  fog-aws (~> 0.2)
   httpclient (~> 2.6)
   jeweler (~> 1.8)
   pry

data/VERSION

@@ -1 +1 @@
-1.0.0
+1.0.1.pre

data/example/settings.yml

@@ -1,19 +1,20 @@
 # RabbitMQ URL, defaults to ENV['AMQP_URL']
-amqp_url: <%= ENV['AMQP_URL'] %>
+:amqp_url: <%= ENV['AMQP_URL'] %>
 
 # Execution storage scenario: cloud | nfs | local | plgdata
 # This setting may be overriden for each task
-storage: <%= ENV['STORAGE'] || 'cloud' %> 
+:storage: <%= ENV['STORAGE'] || 'cloud' %> 
 
 # Number of execution threads (defaults to: ENV['THREADS'], `nprocs` if available or 1)
-threads: <%= Executor::cpu_count %>
+:threads: <%= Executor::cpu_count %>
 
 # Cloud storage settings, the following hash is passed directyl to Fog::Storage, see http://fog.io/storage/ for further reference
 # Defaults to AWS S3 with credentials passed in ENV
-cloud_storage:
-  provider: AWS
-  aws_access_key_id:        <%= ENV['AWS_ACCESS_KEY_ID'] %>
-  aws_secret_access_key:    <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
+:cloud_storage:
+  :provider: AWS
+  :aws_access_key_id:        <%= ENV['AWS_ACCESS_KEY_ID'] %>
+  :aws_secret_access_key:    <%= ENV['AWS_SECRET_ACCESS_KEY'] %>
+  :region:                   <%= ENV['AWS_REGION'] %>
 
-plgdata:
-  proxy: <%= ENV['X509_USER_PROXY'] or "./grid_proxy "%>
+:plgdata:
+  :proxy: <%= ENV['X509_USER_PROXY'] or "./grid_proxy "%>

data/hyperflow-amqp-executor.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: hyperflow-amqp-executor 1.0.0 ruby lib
+# stub: hyperflow-amqp-executor 1.0.1.pre ruby lib
 
 Gem::Specification.new do |s|
   s.name = "hyperflow-amqp-executor"
-  s.version = "1.0.0"
+  s.version = "1.0.1.pre"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kamil Figiela"]
-  s.date = "2015-04-30"
+  s.date = "2015-05-18"
   s.description = "AMQP job executor for Hyperflow workflow engine (http://github.com/dice-cyfronet/hyperflow)"
   s.email = "kamil.figiela@gmail.com"
   s.executables = ["hyperflow-amqp-executor", "hyperflow-amqp-metric-collector"]
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     "bin/hyperflow-amqp-executor",
     "bin/hyperflow-amqp-metric-collector",
     "example/settings.yml",
-    "example/task.json",
     "hyperflow-amqp-executor.gemspec",
     "lib/hyperflow-amqp-executor.rb",
     "lib/hyperflow-amqp-executor/cloud_storage.rb",
@@ -53,7 +52,8 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<fog>, ["~> 1.18"])
+      s.add_runtime_dependency(%q<fog>, ["~> 1.30"])
+      s.add_runtime_dependency(%q<fog-aws>, ["~> 0.2"])
       s.add_runtime_dependency(%q<unf>, ["~> 0.1"])
       s.add_runtime_dependency(%q<recursive-open-struct>, ["~> 0.4"])
       s.add_runtime_dependency(%q<amqp>, ["~> 1.1"])
@@ -65,7 +65,8 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
       s.add_development_dependency(%q<pry>, [">= 0"])
     else
-      s.add_dependency(%q<fog>, ["~> 1.18"])
+      s.add_dependency(%q<fog>, ["~> 1.30"])
+      s.add_dependency(%q<fog-aws>, ["~> 0.2"])
       s.add_dependency(%q<unf>, ["~> 0.1"])
       s.add_dependency(%q<recursive-open-struct>, ["~> 0.4"])
       s.add_dependency(%q<amqp>, ["~> 1.1"])
@@ -78,7 +79,8 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry>, [">= 0"])
     end
   else
-    s.add_dependency(%q<fog>, ["~> 1.18"])
+    s.add_dependency(%q<fog>, ["~> 1.30"])
+    s.add_dependency(%q<fog-aws>, ["~> 0.2"])
     s.add_dependency(%q<unf>, ["~> 0.1"])
     s.add_dependency(%q<recursive-open-struct>, ["~> 0.4"])
     s.add_dependency(%q<amqp>, ["~> 1.1"])

data/lib/hyperflow-amqp-executor/gridftp_storage.rb

@@ -1,4 +1,3 @@
-require 'pry'
 module Executor
   module GridFTPStorage
     def storage_init

data/lib/hyperflow-amqp-executor/settings.rb

@@ -1,4 +1,6 @@
 require 'deep_merge'
+require 'erb'
+
 module Executor
   class Settings
     class << self

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hyperflow-amqp-executor
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1.pre
 platform: ruby
 authors:
 - Kamil Figiela
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-30 00:00:00.000000000 Z
+date: 2015-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -16,14 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.30'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.30'
+- !ruby/object:Gem::Dependency
+  name: fog-aws
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
 - !ruby/object:Gem::Dependency
   name: unf
   requirement: !ruby/object:Gem::Requirement
@@ -184,7 +198,6 @@ files:
 - bin/hyperflow-amqp-executor
 - bin/hyperflow-amqp-metric-collector
 - example/settings.yml
-- example/task.json
 - hyperflow-amqp-executor.gemspec
 - lib/hyperflow-amqp-executor.rb
 - lib/hyperflow-amqp-executor/cloud_storage.rb
@@ -212,9 +225,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.2.2

data/example/task.json

@@ -1,7 +0,0 @@
-{
-  "executable": "/usr/bin/sort",
-  "args": ["-o", "outfile", "infile"],
-  "inputs": [{"name": "infile"}],
-  "outputs": [{"name": "outfile"}],
-  "options": {"prefix": "/people/plgkfigiela/data/"}
-}