Modification to use all gems from the system.

diff --git a/rocci-server/debian/patches/bundler.patch b/rocci-server/debian/patches/bundler.patch
deleted file mode 100644 (file)
index b1e458e..0000000
--- a/rocci-server/debian/patches/bundler.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-commit 55aa8051ff0998f2b43b1ebd6ed4425990fa322c
-Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Fri Mar 7 13:14:19 2014 +0100
-
-    Patch for compatibility with Debian 7 bundler.
-
-diff --git a/Gemfile.lock b/Gemfile.lock
-index 8dc2ef3..5a40d60 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -13,20 +13,6 @@ GIT
-   specs:
-     openssl_cms_1_9_3 (0.0.2)
- 
--GIT
--  remote: https://github.com/arax/openssl-cms.git
--  revision: 7fea071f542ff1cb57c28dffe623122848ed3f99
--  branch: ruby_2_0_0
--  specs:
--    openssl_cms_2_0_0 (0.0.2)
--
--GIT
--  remote: https://github.com/arax/openssl-cms.git
--  revision: b789b696d821bd6563dd207fb6b562c06acc835b
--  branch: ruby_2_1
--  specs:
--    openssl_cms_2_1 (0.0.2)
--
- GEM
-   remote: https://rubygems.org/
-   specs:
-@@ -275,8 +261,6 @@ DEPENDENCIES
-   occi-core (~> 4.2.10)
-   opennebula (~> 4.4.0)
-   openssl_cms_1_9_3!
--  openssl_cms_2_0_0!
--  openssl_cms_2_1!
-   passenger (= 4.0.29)
-   pry-rails
-   pry-rescue
-diff --git a/lib/authentication_strategies/bundles/Gemfile.keystone b/lib/authentication_strategies/bundles/Gemfile.keystone
-index 7abebc5..cbce134 100644
---- a/lib/authentication_strategies/bundles/Gemfile.keystone
-+++ b/lib/authentication_strategies/bundles/Gemfile.keystone
-@@ -2,7 +2,3 @@
- #raise "KeystoneStrategy requires CRuby!" unless RUBY_ENGINE == "ruby"
- 
- gem "openssl_cms_1_9_3", git: 'https://github.com/arax/openssl-cms.git', branch: 'ruby_1_9_3', require: false, platforms: :ruby_19
--
--gem "openssl_cms_2_0_0", git: 'https://github.com/arax/openssl-cms.git', branch: 'ruby_2_0_0', require: false, platforms: :ruby_20
--
--gem "openssl_cms_2_1", git: 'https://github.com/arax/openssl-cms.git', branch: 'ruby_2_1', require: false, platforms: :ruby_21

diff --git a/rocci-server/debian/patches/series b/rocci-server/debian/patches/series
index 50a695f..b4e6533 100644 (file)
--- a/rocci-server/debian/patches/series
+++ b/rocci-server/debian/patches/series
@@ -1,3 +1,2 @@
-bundler.patch
-unbundle.patch
+unbundle-all.patch
 config.patch

diff --git a/rocci-server/debian/patches/unbundle-all.patch b/rocci-server/debian/patches/unbundle-all.patch
new file mode 100644 (file)
index 0000000..588760b
--- /dev/null
+++ b/rocci-server/debian/patches/unbundle-all.patch
@@ -0,0 +1,304 @@
+commit 57efd09d6b61ed81b729631dd41a963d4b0d884a
+Author: František Dvořák <valtri@civ.zcu.cz>
+Date:   Thu Mar 13 14:27:10 2014 +0100
+
+    All gems from the system.
+
+diff --git a/.bundle/config b/.bundle/config
+deleted file mode 100644
+index 57d4641..0000000
+--- a/.bundle/config
++++ /dev/null
+@@ -1,3 +0,0 @@
+----
+-BUNDLE_PATH: vendor/bundle
+-BUNDLE_DISABLE_SHARED_GEMS: '1'
+diff --git a/Gemfile b/Gemfile
+index 94a3593..b6553f7 100644
+--- a/Gemfile
++++ b/Gemfile
+@@ -75,7 +75,7 @@ gem 'kgio'
+ gem 'warden'
+ 
+ # Sensible logging with LogStash support
+-gem 'logstasher', git: "git://github.com/arax/logstasher.git", branch: "master"
++gem 'logstasher'
+ 
+ # Use Hashie::Mash to simplify hash-related stuff
+ gem 'hashie'
+diff --git a/Gemfile.lock b/Gemfile.lock
+index 3a6dbbd..58bb5c8 100644
+--- a/Gemfile.lock
++++ b/Gemfile.lock
+@@ -1,256 +1,5 @@
+-GIT
+-  remote: git://github.com/arax/logstasher.git
+-  revision: 4ceebbb27b647d7f15776afba4893684c575ce72
+-  branch: master
+-  specs:
+-    logstasher (0.5.0)
+-      logstash-event (~> 1.1.0)
+-
+-GIT
+-  remote: https://github.com/arax/openssl-cms.git
+-  revision: b6d079c076a9b8e15c573bf6660772ee83e34dd4
+-  branch: ruby_1_9_3
+-  specs:
+-    openssl_cms_1_9_3 (0.0.2)
+-
+-GIT
+-  remote: https://github.com/arax/openssl-cms.git
+-  revision: 7fea071f542ff1cb57c28dffe623122848ed3f99
+-  branch: ruby_2_0_0
+-  specs:
+-    openssl_cms_2_0_0 (0.0.2)
+-
+-GIT
+-  remote: https://github.com/arax/openssl-cms.git
+-  revision: b789b696d821bd6563dd207fb6b562c06acc835b
+-  branch: ruby_2_1
+-  specs:
+-    openssl_cms_2_1 (0.0.2)
+-
+ GEM
+   remote: https://rubygems.org/
+-  specs:
+-    actionmailer (4.0.3)
+-      actionpack (= 4.0.3)
+-      mail (~> 2.5.4)
+-    actionpack (4.0.3)
+-      activesupport (= 4.0.3)
+-      builder (~> 3.1.0)
+-      erubis (~> 2.7.0)
+-      rack (~> 1.5.2)
+-      rack-test (~> 0.6.2)
+-    activemodel (4.0.3)
+-      activesupport (= 4.0.3)
+-      builder (~> 3.1.0)
+-    activerecord (4.0.3)
+-      activemodel (= 4.0.3)
+-      activerecord-deprecated_finders (~> 1.0.2)
+-      activesupport (= 4.0.3)
+-      arel (~> 4.0.0)
+-    activerecord-deprecated_finders (1.0.3)
+-    activesupport (4.0.3)
+-      i18n (~> 0.6, >= 0.6.4)
+-      minitest (~> 4.2)
+-      multi_json (~> 1.3)
+-      thread_safe (~> 0.1)
+-      tzinfo (~> 0.3.37)
+-    arel (4.0.2)
+-    atomic (1.1.15)
+-    binding_of_caller (0.7.2)
+-      debug_inspector (>= 0.0.1)
+-    bond (0.5.1)
+-    builder (3.1.4)
+-    capistrano (2.15.5)
+-      highline
+-      net-scp (>= 1.0.0)
+-      net-sftp (>= 2.0.0)
+-      net-ssh (>= 2.0.14)
+-      net-ssh-gateway (>= 1.1.0)
+-    celluloid (0.15.2)
+-      timers (~> 1.1.0)
+-    celluloid-io (0.15.0)
+-      celluloid (>= 0.15.0)
+-      nio4r (>= 0.5.0)
+-    chronic (0.10.2)
+-    coderay (1.1.0)
+-    columnize (0.3.6)
+-    daemon_controller (1.2.0)
+-    dalli (2.7.0)
+-    debug_inspector (0.0.2)
+-    debugger (1.6.6)
+-      columnize (>= 0.3.1)
+-      debugger-linecache (~> 1.2.0)
+-      debugger-ruby_core_source (~> 1.3.2)
+-    debugger-linecache (1.2.0)
+-    debugger-ruby_core_source (1.3.2)
+-    diff-lcs (1.2.5)
+-    docile (1.1.3)
+-    erubis (2.7.0)
+-    ffi (1.9.3)
+-    formatador (0.2.4)
+-    fuubar (1.3.2)
+-      rspec (>= 2.14.0, < 3.1.0)
+-      ruby-progressbar (~> 1.3)
+-    guard (2.5.1)
+-      formatador (>= 0.2.4)
+-      listen (~> 2.6)
+-      lumberjack (~> 1.0)
+-      pry (>= 0.9.12)
+-      thor (>= 0.18.1)
+-    guard-bundler (2.0.0)
+-      bundler (~> 1.0)
+-      guard (~> 2.2)
+-    guard-rails (0.5.0)
+-      guard (>= 2.0.0)
+-    guard-test (2.0.4)
+-      guard (~> 2.0)
+-      test-unit (~> 2.2)
+-    hashie (2.0.5)
+-    highline (1.6.21)
+-    hike (1.2.3)
+-    hirb (0.7.1)
+-    i18n (0.6.9)
+-    ice_nine (0.11.0)
+-    interception (0.5)
+-    jbuilder (2.0.4)
+-      activesupport (>= 3.0.0)
+-      multi_json (>= 1.2.0)
+-    json (1.8.1)
+-    kgio (2.9.2)
+-    libnotify (0.8.2)
+-      ffi (>= 1.0.11)
+-    listen (2.7.0)
+-      celluloid (>= 0.15.2)
+-      celluloid-io (>= 0.15.0)
+-      rb-fsevent (>= 0.9.3)
+-      rb-inotify (>= 0.9)
+-    logstash-event (1.1.5)
+-    lumberjack (1.0.4)
+-    mail (2.5.4)
+-      mime-types (~> 1.16)
+-      treetop (~> 1.4.8)
+-    method_source (0.8.2)
+-    mime-types (1.25.1)
+-    mini_portile (0.5.2)
+-    minitest (4.7.5)
+-    multi_json (1.9.0)
+-    net-scp (1.1.2)
+-      net-ssh (>= 2.6.5)
+-    net-sftp (2.1.2)
+-      net-ssh (>= 2.6.5)
+-    net-ssh (2.8.0)
+-    net-ssh-gateway (1.2.0)
+-      net-ssh (>= 2.6.5)
+-    nio4r (1.0.0)
+-    nokogiri (1.6.1)
+-      mini_portile (~> 0.5.0)
+-    occi-core (4.2.10)
+-      activesupport (~> 4.0.0)
+-      hashie
+-      json
+-      settingslogic
+-      uuidtools (>= 2.1.3)
+-    opennebula (4.4.0)
+-      json
+-      nokogiri
+-    passenger (4.0.29)
+-      daemon_controller (>= 1.1.0)
+-      rack
+-      rake (>= 0.8.1)
+-    polyglot (0.3.4)
+-    pry (0.9.12.6)
+-      coderay (~> 1.0)
+-      method_source (~> 0.8)
+-      slop (~> 3.4)
+-    pry-rails (0.3.2)
+-      pry (>= 0.9.10)
+-    pry-rescue (1.4.0)
+-      interception (>= 0.4)
+-      pry
+-    pry-stack_explorer (0.4.9.1)
+-      binding_of_caller (>= 0.7)
+-      pry (>= 0.9.11)
+-    rack (1.5.2)
+-    rack-test (0.6.2)
+-      rack (>= 1.0)
+-    rails (4.0.3)
+-      actionmailer (= 4.0.3)
+-      actionpack (= 4.0.3)
+-      activerecord (= 4.0.3)
+-      activesupport (= 4.0.3)
+-      bundler (>= 1.3.0, < 2.0)
+-      railties (= 4.0.3)
+-      sprockets-rails (~> 2.0.0)
+-    rails-api (0.2.0)
+-      actionpack (>= 3.2.11)
+-      railties (>= 3.2.11)
+-    railties (4.0.3)
+-      actionpack (= 4.0.3)
+-      activesupport (= 4.0.3)
+-      rake (>= 0.8.7)
+-      thor (>= 0.18.1, < 2.0)
+-    rake (10.1.1)
+-    rb-fsevent (0.9.4)
+-    rb-inotify (0.9.3)
+-      ffi (>= 0.5.0)
+-    rdoc (4.1.1)
+-      json (~> 1.4)
+-    redcarpet (3.1.1)
+-    rspec (2.14.1)
+-      rspec-core (~> 2.14.0)
+-      rspec-expectations (~> 2.14.0)
+-      rspec-mocks (~> 2.14.0)
+-    rspec-core (2.14.8)
+-    rspec-expectations (2.14.5)
+-      diff-lcs (>= 1.1.3, < 2.0)
+-    rspec-mocks (2.14.6)
+-    rspec-rails (2.14.1)
+-      actionpack (>= 3.0)
+-      activemodel (>= 3.0)
+-      activesupport (>= 3.0)
+-      railties (>= 3.0)
+-      rspec-core (~> 2.14.0)
+-      rspec-expectations (~> 2.14.0)
+-      rspec-mocks (~> 2.14.0)
+-    ruby-progressbar (1.4.2)
+-    rvm-capistrano (1.5.1)
+-      capistrano (~> 2.15.4)
+-    sdoc (0.4.0)
+-      json (~> 1.8)
+-      rdoc (~> 4.0, < 5.0)
+-    settingslogic (2.0.9)
+-    simplecov (0.8.2)
+-      docile (~> 1.1.0)
+-      multi_json
+-      simplecov-html (~> 0.8.0)
+-    simplecov-html (0.8.0)
+-    slop (3.4.7)
+-    sprockets (2.11.0)
+-      hike (~> 1.2)
+-      multi_json (~> 1.0)
+-      rack (~> 1.0)
+-      tilt (~> 1.1, != 1.3.0)
+-    sprockets-rails (2.0.1)
+-      actionpack (>= 3.0)
+-      activesupport (>= 3.0)
+-      sprockets (~> 2.8)
+-    test-unit (2.5.5)
+-    thor (0.18.1)
+-    thread_safe (0.2.0)
+-      atomic (>= 1.1.7, < 2)
+-    tilt (1.4.1)
+-    timers (1.1.0)
+-    treetop (1.4.15)
+-      polyglot
+-      polyglot (>= 0.3.1)
+-    tzinfo (0.3.38)
+-    uuidtools (2.1.4)
+-    warden (1.2.3)
+-      rack (>= 1.0)
+-    whenever (0.9.2)
+-      activesupport (>= 2.3.4)
+-      chronic (>= 0.6.3)
+-    yard (0.8.7.3)
+ 
+ PLATFORMS
+   ruby
+@@ -271,12 +20,10 @@ DEPENDENCIES
+   jbuilder (~> 2.0.0)
+   kgio
+   libnotify
+-  logstasher!
++  logstasher
+   occi-core (~> 4.2.10)
+   opennebula (~> 4.4.0)
+-  openssl_cms_1_9_3!
+-  openssl_cms_2_0_0!
+-  openssl_cms_2_1!
++  openssl_cms_1_9_3
+   passenger (= 4.0.29)
+   pry-rails
+   pry-rescue

diff --git a/rocci-server/debian/patches/unbundle.patch b/rocci-server/debian/patches/unbundle.patch
deleted file mode 100644 (file)
index 5ba2837..0000000
--- a/rocci-server/debian/patches/unbundle.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-commit 78a0c6345dbdd7050d4cbf420d3a0f3abe34d204
-Author: František Dvořák <valtri@civ.zcu.cz>
-Date:   Sat Mar 8 13:09:34 2014 +0100
-
-    Use from system:
-    - passenger (apache module)
-    - nokogiri (bundles libxslt, libxml2)
-    - rake, yard, redcarpet
-
-diff --git a/Gemfile b/Gemfile
-index 94a3593..c82753b 100644
---- a/Gemfile
-+++ b/Gemfile
-@@ -25,9 +25,6 @@ gem 'debugger', group: [:development, :test]
- # Use whenever for scheduled jobs
- gem 'whenever', require: false
- 
--# Use passenger for deployment (standalone or in Apache2)
--gem 'passenger', '= 4.0.29'
--
- # Use simplecov for coverage reports
- gem 'simplecov', group: [:development, :test]
- 
-@@ -49,10 +46,6 @@ gem 'guard-rails', group: :development
- gem 'rb-inotify', require: false, group: :development
- gem 'libnotify', group: :development
- 
--# Use YARD for documentation
--gem 'yard', group: :development
--gem 'redcarpet', group: :development
--
- # Use bond+hirb to extend irb
- #
- # Add the following to your ~/.irbrc:
-diff --git a/Gemfile.lock b/Gemfile.lock
-index 2823ef1..667a903 100644
---- a/Gemfile.lock
-+++ b/Gemfile.lock
-@@ -128,8 +128,6 @@ GEM
-     net-ssh-gateway (1.2.0)
-       net-ssh (>= 2.6.5)
-     nio4r (1.0.0)
--    nokogiri (1.6.1)
--      mini_portile (~> 0.5.0)
-     occi-core (4.2.10)
-       activesupport (~> 4.0.0)
-       hashie
-@@ -138,11 +136,6 @@ GEM
-       uuidtools (>= 2.1.3)
-     opennebula (4.4.0)
-       json
--      nokogiri
--    passenger (4.0.29)
--      daemon_controller (>= 1.1.0)
--      rack
--      rake (>= 0.8.1)
-     polyglot (0.3.4)
-     pry (0.9.12.6)
-       coderay (~> 1.0)
-@@ -173,15 +166,12 @@ GEM
-     railties (4.0.3)
-       actionpack (= 4.0.3)
-       activesupport (= 4.0.3)
--      rake (>= 0.8.7)
-       thor (>= 0.18.1, < 2.0)
--    rake (10.1.1)
-     rb-fsevent (0.9.4)
-     rb-inotify (0.9.3)
-       ffi (>= 0.5.0)
-     rdoc (4.1.1)
-       json (~> 1.4)
--    redcarpet (3.1.1)
-     rspec (2.14.1)
-       rspec-core (~> 2.14.0)
-       rspec-expectations (~> 2.14.0)
-@@ -236,7 +226,6 @@ GEM
-     whenever (0.9.2)
-       activesupport (>= 2.3.4)
-       chronic (>= 0.6.3)
--    yard (0.8.7.3)
- 
- PLATFORMS
-   ruby
-@@ -261,18 +250,15 @@ DEPENDENCIES
-   occi-core (~> 4.2.10)
-   opennebula (~> 4.4.0)
-   openssl_cms_1_9_3!
--  passenger (= 4.0.29)
-   pry-rails
-   pry-rescue
-   pry-stack_explorer
-   rails (~> 4.0.0)
-   rails-api (~> 0.2.0)
-   rb-inotify
--  redcarpet
-   rspec-rails
-   rvm-capistrano
-   sdoc
-   simplecov
-   warden
-   whenever
--  yard