[v0.0.2-beta] Upgrade ruby

.gitignore

@@ -18,6 +18,8 @@ control/analysis/*
 !control/analysis/.blank
 control/status/*
 !control/status/.blank
+control/rules/*
+!control/rules/.blank
 control/wordlists/*
 !control/wordlists/.blank
 !control/wordlists/password.gz
@@ -28,5 +30,5 @@ cudaHashcat.log
 *.restore
 *.idea
 dump.rdb
-~                                                                                                                                            
-~                           
+~
+~

.ruby-version

@@ -0,0 +1 @@
+2.4.4

Gemfile

@@ -1,10 +1,8 @@
 source 'https://rubygems.org'
-ruby '2.2.2'
 
-gem 'resque'
-gem 'json'
-gem 'foreman'
-gem 'rest-client'
+gem 'foreman', '~> 0.85.0'
+gem 'json', '~> 2.1'
 gem 'logger'
-
-
+gem 'resque', '~> 1.27', '>= 1.27.4'
+gem 'rest-client', '~> 2.0', '>= 2.0.2'
+gem 'rake', '~> 11.2', '>= 11.2.2'

Gemfile.lock

@@ -1,60 +1,59 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    domain_name (0.5.20170404)
+    domain_name (0.5.20180417)
       unf (>= 0.0.5, < 1.0.0)
-    foreman (0.84.0)
+    foreman (0.85.0)
       thor (~> 0.19.1)
     http-cookie (1.0.3)
       domain_name (~> 0.5)
-    json (2.0.3)
+    json (2.1.0)
     logger (1.2.8)
     mime-types (3.1)
       mime-types-data (~> 3.2015)
     mime-types-data (3.2016.0521)
     mono_logger (1.1.0)
-    multi_json (1.12.1)
+    multi_json (1.13.1)
+    mustermann (1.0.2)
     netrc (0.11.0)
-    rack (1.6.5)
-    rack-protection (1.5.3)
+    rack (2.0.5)
+    rack-protection (2.0.3)
       rack
-    redis (3.3.3)
-    redis-namespace (1.5.3)
-      redis (~> 3.0, >= 3.0.4)
-    resque (1.27.2)
+    redis (4.0.1)
+    redis-namespace (1.6.0)
+      redis (>= 3.0.4)
+    resque (1.27.4)
       mono_logger (~> 1.0)
       multi_json (~> 1.0)
       redis-namespace (~> 1.3)
       sinatra (>= 0.9.2)
       vegas (~> 0.1.2)
-    rest-client (2.0.1)
+    rest-client (2.0.2)
       http-cookie (>= 1.0.2, < 2.0)
       mime-types (>= 1.16, < 4.0)
       netrc (~> 0.8)
-    sinatra (1.4.8)
-      rack (~> 1.5)
-      rack-protection (~> 1.4)
-      tilt (>= 1.3, < 3)
+    sinatra (2.0.3)
+      mustermann (~> 1.0)
+      rack (~> 2.0)
+      rack-protection (= 2.0.3)
+      tilt (~> 2.0)
     thor (0.19.4)
-    tilt (2.0.7)
+    tilt (2.0.8)
     unf (0.1.4)
       unf_ext
-    unf_ext (0.0.7.2)
+    unf_ext (0.0.7.5)
     vegas (0.1.11)
       rack (>= 1.0.0)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  foreman
-  json
+  foreman (~> 0.85.0)
+  json (~> 2.1)
   logger
-  resque
-  rest-client
-
-RUBY VERSION
-   ruby 2.2.2p95
+  resque (~> 1.27, >= 1.27.4)
+  rest-client (~> 2.0, >= 2.0.2)
 
 BUNDLED WITH
-   1.15.4
+   1.16.2

background_worker.rb

@@ -43,7 +43,7 @@ def self.post(url, payload)
         method: :post,
         url: url,
         payload: payload.to_json,
-        headers: {:accept => :json, :content_type => 'application/json'},
+        headers: {accept: :json, content_type: 'application/json'},
         cookies: {agent_uuid: @uuid},
         verify_ssl: false
       )
@@ -372,7 +372,7 @@ def sync_wordlists()
 
       # generate checksums for newly downloaded file
       puts 'Calculating checksum'
- 
+
       checksum = ''
       case get_os
         when /mac/  #provide mac support
@@ -505,7 +505,7 @@ def hc_device_list()
             end
           end
         end
-        
+
         # generate hashfile via api
         hashes = Api.hashfile(jobtask['id'], job['hashfile_id'])