Merge pull request diaspora#4116 from Raven24/remove-capistrano

remove capistrano from the main source code repo

Changelog.md

@@ -23,22 +23,22 @@ To update do the following:
 
 3. Start Resque web (you'll need temporary access to port 5678, check
    your Firewall if needed!):
-   
+
    ```
    bundle exec resque-web
    ```
-   
+
    In case you need it you can adjust the port with the `-p` flag.
 4. One last time, start a Resque worker:
-   
+
    ```
    RAILS_ENV=production QUEUE=* bundle exec rake resque:work
    ```
 
    Visit Resque web via http://your_host:5678, wait until all queues but the
    failed one are empty (show 0 jobs).
 5. Kill the Resque worker by hitting Ctrl+C. Kill Resque web with:
-   
+
    ```
    bundle exec resque-web -k
    ```
@@ -87,6 +87,14 @@ We're automatically adjusting the ActiveRecord connection pool size for you.
 Larger Heroku setups should have enough expertise to figure out what to do
 by them self.
 
+### Removal of Capistrano
+
+The Capistrano deployment scripts were removed from the main source code
+repository, since they were no longer working.
+They will be moved into their own repository with a new maintainer,
+you'll be able to find them under the Diaspora* Github organization once
+everything is set up.
+
 ### Other
 
 * Cleaned up requires of our own libraries [#3993](https://github.com/diaspora/diaspora/pull/3993)

Gemfile

@@ -148,22 +148,17 @@ group :production do # we don't install these on travis to speed up test runs
 end
 
 group :development do
-  # Deployment
-
-  gem 'capistrano',        '2.12.0', :require => false
-  gem 'capistrano_colors', '0.5.5',  :require => false
-
   # Comparison images
 
   gem 'rmagick', '2.13.2', :require => false
-  
+
   # Automatic test runs
 
   gem 'guard-cucumber', '1.3.2'
   gem 'guard-rspec',    '2.5.1'
   gem 'rb-fsevent',     '0.9.3', :require => false
   gem 'rb-inotify',     '0.9.0', :require => false
-  
+
   # Preloading environment
 
   gem 'guard-spork', '1.5.0'
@@ -176,13 +171,13 @@ group :test do
   gem 'fixture_builder', '0.3.5'
   gem 'fuubar',          '1.1.0'
   gem 'rspec-instafail', '0.2.4', :require => false
-  
+
   # Cucumber (integration tests)
 
   gem 'capybara',           '1.1.3'
   gem 'database_cleaner',   '0.9.1'
   gem 'selenium-webdriver', '2.31.0'
-  
+
   # General helpers
 
   gem 'factory_girl_rails', '4.2.1'
@@ -194,10 +189,10 @@ end
 group :development, :test do
   # RSpec (unit tests, some integration tests)
   gem "rspec-rails",     '2.13.0'
-  
+
   # Cucumber (integration tests)
   gem 'cucumber-rails',     '1.3.1', :require => false
-  
+
   # Jasmine (client side application tests (JS))
   gem 'jasmine', '1.3.2'
 end

Gemfile.lock

@@ -45,13 +45,6 @@ GEM
     bootstrap-sass (2.2.2.0)
       sass (~> 3.2)
     builder (3.0.4)
-    capistrano (2.12.0)
-      highline
-      net-scp (>= 1.0.0)
-      net-sftp (>= 2.0.0)
-      net-ssh (>= 2.0.14)
-      net-ssh-gateway (>= 1.1.0)
-    capistrano_colors (0.5.5)
     capybara (1.1.3)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
@@ -172,7 +165,6 @@ GEM
       sprockets (>= 2.0.3)
       tilt
     hashie (1.2.0)
-    highline (1.6.12)
     hike (1.2.1)
     http_accept_language (1.0.2)
     httpauth (0.2.0)
@@ -225,11 +217,7 @@ GEM
     nested_form (0.3.1)
     net-scp (1.1.0)
       net-ssh (>= 2.6.5)
-    net-sftp (2.0.5)
-      net-ssh (>= 2.0.9)
     net-ssh (2.6.6)
-    net-ssh-gateway (1.1.0)
-      net-ssh (>= 1.99.1)
     nokogiri (1.5.9)
     oauth (0.4.7)
     oauth2 (0.8.0)
@@ -428,8 +416,6 @@ DEPENDENCIES
   addressable (= 2.3.3)
   asset_sync (= 0.5.4)
   bootstrap-sass (= 2.2.2.0)
-  capistrano (= 2.12.0)
-  capistrano_colors (= 0.5.5)
   capybara (= 1.1.3)
   carrierwave (= 0.8.0)
   client_side_validations (= 3.2.2)