updated dependencies

dc486e8d · source_reader · f4f863c5 · dc486e8d · dc486e8d · dc486e8d
Commit dc486e8d authored Sep 17, 2019 by source_reader
Showing with 146 additions and 128 deletions
Gemfile.lock
spec/factories/annotation.rb
spec/factories/data_apps.rb
spec/factories/data_views.rb
spec/factories/db_element.rb
spec/factories/db_folder.rb
spec/factories/db_stream.rb
spec/factories/dbs.rb
spec/factories/joule_modules.rb
spec/factories/nilms.rb
spec/factories/users.rb
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -42,28 +42,27 @@ GEM
      i18n (>= 0.7, < 2)
      minitest (~> 5.1)
      tzinfo (~> 1.1)
-    addressable (2.5.2)
+    addressable (2.7.0)
-      public_suffix (>= 2.0.2, < 4.0)
+      public_suffix (>= 2.0.2, < 5.0)
-    airbrussh (1.3.1)
+    airbrussh (1.3.4)
      sshkit (>= 1.6.1, != 1.7.0)
    ansi (1.5.0)
    arel (9.0.0)
    ast (2.4.0)
-    backports (3.11.4)
+    backports (3.15.0)
-    bcrypt (3.1.12)
+    bcrypt (3.1.13)
-    bindex (0.5.0)
+    bindex (0.8.1)
-    bootsnap (1.3.2)
+    bootsnap (1.4.5)
      msgpack (~> 1.0)
    builder (3.2.3)
-    byebug (10.0.2)
+    byebug (11.0.1)
-    capistrano (3.11.0)
+    capistrano (3.11.1)
      airbrussh (>= 1.0.0)
      i18n
      rake (>= 10.0.0)
      sshkit (>= 1.9.0)
-    capistrano-bundler (1.4.0)
+    capistrano-bundler (1.6.0)
      capistrano (~> 3.1)
-      sshkit (~> 1.2)
    capistrano-passenger (0.2.0)
      capistrano (~> 3.0)
    capistrano-rails (1.4.0)
@@ -72,7 +71,7 @@ GEM
    capistrano-rbenv (2.1.4)
      capistrano (~> 3.1)
      sshkit (~> 1.3)
-    capybara (3.12.0)
+    capybara (3.15.1)
      addressable
      mini_mime (>= 0.1.3)
      nokogiri (~> 1.8)
@@ -82,12 +81,12 @@ GEM
      xpath (~> 3.2)
    coderay (1.1.2)
    concurrent-ruby (1.1.5)
-    coveralls (0.8.23)
+    coveralls (0.7.1)
-      json (>= 1.8, < 3)
+      multi_json (~> 1.3)
-      simplecov (~> 0.16.1)
+      rest-client
-      term-ansicolor (~> 1.3)
+      simplecov (>= 0.7)
-      thor (>= 0.19.4, < 2.0)
+      term-ansicolor
-      tins (~> 1.6)
+      thor
    crack (0.4.3)
      safe_yaml (~> 1.0.0)
    crass (1.0.4)
@@ -105,48 +104,51 @@ GEM
      cucumber-tag_expressions (~> 1.1.0)
      gherkin (~> 5.0)
    cucumber-expressions (6.0.1)
-    cucumber-rails (1.6.0)
+    cucumber-rails (1.8.0)
-      capybara (>= 1.1.2, < 4)
+      capybara (>= 2.12, < 4)
      cucumber (>= 3.0.2, < 4)
-      mime-types (>= 1.17, < 4)
+      mime-types (>= 2.0, < 4)
      nokogiri (~> 1.8)
-      railties (>= 4, < 6)
+      railties (>= 4.2, < 7)
    cucumber-tag_expressions (1.1.1)
    cucumber-wire (0.0.1)
-    daemons (1.3.0)
+    daemons (1.3.1)
    database_cleaner (1.7.0)
-    devise (4.6.2)
+    devise (4.7.1)
      bcrypt (~> 3.0)
      orm_adapter (~> 0.1)
-      railties (>= 4.1.0, < 6.0)
+      railties (>= 4.1.0)
      responders
      warden (~> 1.2.3)
-    devise_invitable (1.7.5)
+    devise_invitable (2.0.1)
-      actionmailer (>= 4.1.0)
+      actionmailer (>= 5.0)
-      devise (>= 4.0.0)
+      devise (>= 4.6)
-    devise_token_auth (1.1.0)
+    devise_token_auth (1.1.2)
-      devise (> 3.5.2, < 4.7)
+      bcrypt (~> 3.0)
-      rails (>= 4.2.0, < 6)
+      devise (> 3.5.2, < 5)
+      rails (>= 4.2.0, < 6.1)
    diff-lcs (1.3)
-    docile (1.3.1)
+    docile (1.3.2)
+    domain_name (0.5.20190701)
+      unf (>= 0.0.5, < 1.0.0)
    erubi (1.8.0)
    eventmachine (1.2.7)
    eventmachine (1.2.7-x64-mingw32)
    execjs (2.7.0)
-    factory_bot (4.11.1)
+    factory_bot (5.0.2)
-      activesupport (>= 3.0.0)
+      activesupport (>= 4.2.0)
-    factory_bot_rails (4.11.1)
+    factory_bot_rails (5.0.2)
-      factory_bot (~> 4.11.1)
+      factory_bot (~> 5.0.2)
-      railties (>= 3.0.0)
+      railties (>= 4.2.0)
-    faker (1.9.1)
+    faker (2.3.0)
-      i18n (>= 0.7)
+      i18n (~> 1.6.0)
-    ffi (1.9.25)
+    ffi (1.11.1)
-    ffi (1.9.25-x64-mingw32)
+    ffi (1.11.1-x64-mingw32)
    formatador (0.2.5)
    gherkin (5.1.0)
    globalid (0.4.2)
      activesupport (>= 4.2.0)
-    guard (2.15.0)
+    guard (2.15.1)
      formatador (>= 0.2.4)
      listen (>= 2.7, < 4.0)
      lumberjack (>= 1.0.12, < 2.0)
@@ -163,19 +165,20 @@ GEM
    guard-rubocop (1.3.0)
      guard (~> 2.0)
      rubocop (~> 0.20)
-    hashdiff (0.3.7)
+    hashdiff (1.0.0)
-    hashie (3.5.7)
+    hashie (3.6.0)
-    hirb (0.7.3)
+    http-accept (1.7.0)
-    httparty (0.16.3)
+    http-cookie (1.0.3)
+      domain_name (~> 0.5)
+    httparty (0.17.0)
      mime-types (~> 3.0)
      multi_xml (>= 0.5.2)
    i18n (1.6.0)
      concurrent-ruby (~> 1.0)
-    jaro_winkler (1.5.1)
+    jaro_winkler (1.5.3)
-    jbuilder (2.8.0)
+    jbuilder (2.9.1)
      activesupport (>= 4.2.0)
-      multi_json (>= 1.2)
+    jquery-rails (4.3.5)
-    jquery-rails (4.3.3)
      rails-dom-testing (>= 1, < 3)
      railties (>= 4.2.0)
      thor (>= 0.14, < 2.0)
@@ -193,48 +196,48 @@ GEM
    marcel (0.3.3)
      mimemagic (~> 0.3.2)
    method_source (0.9.2)
-    mime-types (3.2.2)
+    mime-types (3.3)
      mime-types-data (~> 3.2015)
-    mime-types-data (3.2018.0812)
+    mime-types-data (3.2019.0904)
    mimemagic (0.3.3)
-    mini_magick (4.9.2)
+    mini_magick (4.9.5)
-    mini_mime (1.0.1)
+    mini_mime (1.0.2)
    mini_portile2 (2.4.0)
    minitest (5.11.3)
-    msgpack (1.2.4)
+    msgpack (1.3.1)
-    msgpack (1.2.4-x64-mingw32)
+    msgpack (1.3.1-x64-mingw32)
    multi_json (1.13.1)
    multi_test (0.1.2)
    multi_xml (0.6.0)
    nenv (0.3.0)
-    net-scp (1.2.1)
+    net-scp (2.0.0)
-      net-ssh (>= 2.6.5)
+      net-ssh (>= 2.6.5, < 6.0.0)
-    net-ssh (5.0.2)
+    net-ssh (5.2.0)
-    nio4r (2.3.1)
+    netrc (0.11.0)
-    nokogiri (1.10.3)
+    nio4r (2.5.1)
+    nokogiri (1.10.4)
      mini_portile2 (~> 2.4.0)
-    nokogiri (1.10.3-x64-mingw32)
+    nokogiri (1.10.4-x64-mingw32)
      mini_portile2 (~> 2.4.0)
-    notiffany (0.1.1)
+    notiffany (0.1.3)
      nenv (~> 0.1)
      shellany (~> 0.0)
-    oj (3.7.4)
+    oj (3.9.1)
-    omniauth (1.8.1)
+    omniauth (1.9.0)
-      hashie (>= 3.4.6, < 3.6.0)
+      hashie (>= 3.4.6, < 3.7.0)
      rack (>= 1.6.2, < 3)
    orm_adapter (0.5.0)
-    parallel (1.12.1)
+    parallel (1.17.0)
-    parser (2.5.3.0)
+    parser (2.6.4.1)
      ast (~> 2.4.0)
-    pg (1.1.3)
+    pg (1.1.4)
-    pg (1.1.3-x64-mingw32)
+    pg (1.1.4-x64-mingw32)
-    powerpack (0.1.2)
    pry (0.12.2)
      coderay (~> 1.1.0)
      method_source (~> 0.9.0)
-    public_suffix (3.0.3)
+    public_suffix (4.0.1)
    rack (2.0.7)
-    rack-cors (1.0.2)
+    rack-cors (1.0.3)
    rack-test (1.1.0)
      rack (>= 1.0, < 3)
    rails (5.2.3)
@@ -253,7 +256,7 @@ GEM
    rails-dom-testing (2.0.3)
      activesupport (>= 4.2.0)
      nokogiri (>= 1.6)
-    rails-html-sanitizer (1.0.4)
+    rails-html-sanitizer (1.2.0)
      loofah (~> 2.2, >= 2.2.2)
    railties (5.2.3)
      actionpack (= 5.2.3)
@@ -262,29 +265,40 @@ GEM
      rake (>= 0.8.7)
      thor (>= 0.19.0, < 2.0)
    rainbow (3.0.0)
-    rake (12.3.2)
+    rake (12.3.3)
    rb-fsevent (0.10.3)
-    rb-inotify (0.9.10)
+    rb-inotify (0.10.0)
-      ffi (>= 0.5.0, < 2)
+      ffi (~> 1.0)
    rdoc (4.3.0)
-    regexp_parser (1.3.0)
+    regexp_parser (1.6.0)
    responders (2.4.1)
      actionpack (>= 4.2.0, < 6.0)
      railties (>= 4.2.0, < 6.0)
+    rest-client (2.1.0)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
+    rest-client (2.1.0-x64-mingw32)
+      ffi (~> 1.9)
+      http-accept (>= 1.7.0, < 2.0)
+      http-cookie (>= 1.0.2, < 2.0)
+      mime-types (>= 1.16, < 4.0)
+      netrc (~> 0.8)
    rspec (3.8.0)
      rspec-core (~> 3.8.0)
      rspec-expectations (~> 3.8.0)
      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
+    rspec-core (3.8.2)
      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    rspec-expectations (3.8.4)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.8.0)
-    rspec-json_expectations (2.1.0)
+    rspec-json_expectations (2.2.0)
-    rspec-mocks (3.8.0)
+    rspec-mocks (3.8.1)
      diff-lcs (>= 1.2.0, < 2.0)
      rspec-support (~> 3.8.0)
-    rspec-rails (3.8.1)
+    rspec-rails (3.8.2)
      actionpack (>= 3.0)
      activesupport (>= 3.0)
      railties (>= 3.0)
@@ -292,21 +306,20 @@ GEM
      rspec-expectations (~> 3.8.0)
      rspec-mocks (~> 3.8.0)
      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+    rspec-support (3.8.2)
-    rubocop (0.61.1)
+    rubocop (0.74.0)
      jaro_winkler (~> 1.5.1)
      parallel (~> 1.10)
-      parser (>= 2.5, != 2.5.1.1)
+      parser (>= 2.6)
-      powerpack (~> 0.1)
      rainbow (>= 2.2.2, < 4.0)
      ruby-progressbar (~> 1.7)
-      unicode-display_width (~> 1.4.0)
+      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-rspec (1.30.1)
+    rubocop-rspec (1.35.0)
      rubocop (>= 0.60.0)
-    ruby-progressbar (1.10.0)
+    ruby-progressbar (1.10.1)
    ruby_dep (1.5.0)
-    safe_yaml (1.0.4)
+    safe_yaml (1.0.5)
-    sass (3.7.2)
+    sass (3.7.4)
      sass-listen (~> 4.0.0)
    sass-listen (4.0.0)
      rb-fsevent (~> 0.9, >= 0.9.4)
@@ -321,14 +334,14 @@ GEM
      json (~> 1.7, >= 1.7.7)
      rdoc (~> 4.0)
    shellany (0.0.1)
-    simplecov (0.16.1)
+    simplecov (0.17.1)
      docile (~> 1.1)
      json (>= 1.8, < 3)
      simplecov-html (~> 0.10.0)
-    simplecov-console (0.4.2)
+    simplecov-console (0.5.0)
      ansi
-      hirb
      simplecov
+      terminal-table
    simplecov-html (0.10.2)
    spring (2.0.2)
      activesupport (>= 4.2)
@@ -341,15 +354,16 @@ GEM
      actionpack (>= 4.0)
      activesupport (>= 4.0)
      sprockets (>= 3.0.0)
-    sqlite3 (1.3.13)
+    sqlite3 (1.4.1)
-    sqlite3 (1.3.13-x64-mingw32)
+    sshkit (1.20.0)
-    sshkit (1.18.0)
      net-scp (>= 1.1.2)
      net-ssh (>= 2.8.0)
    term-ansicolor (1.7.1)
      tins (~> 1.0)
    terminal-notifier (2.0.0)
    terminal-notifier-guard (1.7.0)
+    terminal-table (1.8.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
    thin (1.7.2)
      daemons (~> 1.0, >= 1.0.9)
      eventmachine (~> 1.0, >= 1.0.4)
@@ -357,18 +371,21 @@ GEM
    thor (0.20.3)
    thread_safe (0.3.6)
    tilt (2.0.9)
-    tins (1.20.2)
+    tins (1.21.1)
    turbolinks (5.2.0)
      turbolinks-source (~> 5.2)
    turbolinks-source (5.2.0)
    tzinfo (1.2.5)
      thread_safe (~> 0.1)
-    tzinfo-data (1.2018.7)
+    tzinfo-data (1.2019.3)
      tzinfo (>= 1.0.0)
    uglifier (4.1.20)
      execjs (>= 0.3.0, < 3)
-    unicode-display_width (1.4.0)
+    unf (0.1.4)
-    vcr (4.0.0)
+      unf_ext
+    unf_ext (0.0.7.6)
+    unicode-display_width (1.6.0)
+    vcr (5.0.0)
    warden (1.2.8)
      rack (>= 2.0.6)
    web-console (3.7.0)
@@ -376,13 +393,13 @@ GEM
      activemodel (>= 5.0)
      bindex (>= 0.4.0)
      railties (>= 5.0)
-    webmock (3.4.2)
+    webmock (3.7.5)
      addressable (>= 2.3.6)
      crack (>= 0.3.2)
-      hashdiff
+      hashdiff (>= 0.4.0, < 2.0.0)
-    websocket-driver (0.7.0)
+    websocket-driver (0.7.1)
      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.3)
+    websocket-extensions (0.1.4)
    xpath (3.2.0)
      nokogiri (~> 1.8)

--- a/spec/factories/annotation.rb
+++ b/spec/factories/annotation.rb
 FactoryBot.define do
  factory :annotation do
-    title { Faker::Lorem.words(3).join(' ') }
+    title { Faker::Lorem.words(number: 3).join(' ') }
    content { Faker::Lorem.sentence }
-    start_time { Faker::Number.between(1000,2000) }
+    start_time { Faker::Number.between(from: 1000, to: 2000) }
-    end_time { Faker::Number.between(3000,4000)}
+    end_time { Faker::Number.between(from: 3000, to: 4000)}
    id { Faker::Number.unique.number.to_i}
  end
 end
\ No newline at end of file
--- a/spec/factories/data_apps.rb
+++ b/spec/factories/data_apps.rb
 FactoryBot.define do
  factory :data_app do
-    joule_id { Faker::Number.number(6).to_i}
+    joule_id { Faker::Number.number(digits: 6).to_i}
  end
 end
--- a/spec/factories/data_views.rb
+++ b/spec/factories/data_views.rb
 FactoryBot.define do
  factory :data_view do
-    name { Faker::Lorem.words(3).join(' ') }
+    name { Faker::Lorem.words(number: 3).join(' ') }
    description { Faker::Lorem.sentence }
    visibility { "public" }
    redux_json { "auto generated from factory" }

--- a/spec/factories/db_element.rb
+++ b/spec/factories/db_element.rb
@@ -3,7 +3,7 @@
 # generic DbStream
 FactoryBot.define do
  factory :db_element do
-    name { Faker::Lorem.unique.words(3).join(' ') }
+    name { Faker::Lorem.unique.words(number: 3).join(' ') }
    units { 'volts' }
    sequence(:column)
    default_max { 100 }

--- a/spec/factories/db_folder.rb
+++ b/spec/factories/db_folder.rb
@@ -5,10 +5,10 @@ FactoryBot.define do
  factory :db_folder, aliases: [:root_folder] do
    name { Faker::Lorem.word }
    description { Faker::Lorem.sentence }
-    start_time { Faker::Number.number(6)}
+    start_time { Faker::Number.number(digits: 6)}
-    end_time { start_time + Faker::Number.number(5) }
+    end_time { start_time + Faker::Number.number(digits: 5) }
-    size_on_disk { Faker::Number.number(6) }
+    size_on_disk { Faker::Number.number(digits: 6) }
    hidden { false }
-    path { "/root/#{Faker::Lorem.word}/#{Faker::Number.unique.number(4)}" }
+    path { "/root/#{Faker::Lorem.word}/#{Faker::Number.unique.number(digits: 4)}" }
  end
 end
--- a/spec/factories/db_stream.rb
+++ b/spec/factories/db_stream.rb
@@ -3,14 +3,14 @@
 # generic DbStream
 FactoryBot.define do
  factory :db_stream do
-    name { Faker::Lorem.words(3).join(' ') }
+    name { Faker::Lorem.words(number: 3).join(' ') }
    name_abbrev { Faker::Lorem.word }
    description { Faker::Lorem.sentence }
    delete_locked { false }
-    start_time { Faker::Number.number(6).to_i}
+    start_time { Faker::Number.number(digits: 6).to_i}
-    end_time { start_time + Faker::Number.number(5).to_i }
+    end_time { start_time + Faker::Number.number(digits: 5).to_i }
    total_time {end_time - start_time}
-    size_on_disk { Faker::Number.number(6).to_i }
+    size_on_disk { Faker::Number.number(digits: 6).to_i }
    hidden { false }
    path { "/root/streams/#{Faker::Lorem.unique.word}" }
    data_type { "float32_#{elements_count}" }

--- a/spec/factories/dbs.rb
+++ b/spec/factories/dbs.rb
@@ -3,9 +3,9 @@
 FactoryBot.define do
  factory :db do
    url { "" }
-    max_points_per_plot { Faker::Number.number(3) }
+    max_points_per_plot { Faker::Number.number(digits: 3) }
-    size_db { Faker::Number.number(5) }
+    size_db { Faker::Number.number(digits: 5) }
-    size_other { Faker::Number.number(5) }
+    size_other { Faker::Number.number(digits: 5) }
    size_total { size_db + size_other }
    available { true }
    root_folder

--- a/spec/factories/joule_modules.rb
+++ b/spec/factories/joule_modules.rb
 FactoryBot.define do
  factory :joule_module do
-    name { Faker::Lorem.words(3).join(' ') }
+    name { Faker::Lorem.words(number: 3).join(' ') }
    description { Faker::Lorem.sentence }
    exec_cmd { '/path/to/cmd' }
    web_interface { false }
    status { 'running' }
-    joule_id { Faker::Number.number(3).to_i }
+    joule_id { Faker::Number.number(digits: 3).to_i }
  end
 end
--- a/spec/factories/nilms.rb
+++ b/spec/factories/nilms.rb
@@ -5,11 +5,11 @@ FactoryBot.define do
  factory :nilm do
    db
-    name {Faker::Lorem.unique.words(3).join(' ')}
+    name {Faker::Lorem.unique.words(number: 3).join(' ')}
    description { Faker::Lorem.sentence }
    url {Faker::Internet.unique.url}
    node_type { 'nilmdb' }
-    key {Faker::Lorem.characters(20)}
+    key {Faker::Lorem.characters(number: 20)}
    transient do
      admins { [] }
      owners { [] }

--- a/spec/factories/users.rb
+++ b/spec/factories/users.rb
@@ -3,7 +3,7 @@ FactoryBot.define do
    first_name {Faker::Name.first_name}
    last_name {Faker::Name.first_name}
    email {Faker::Internet.unique.email}
-    password {Faker::Lorem.characters(10)}
+    password {Faker::Lorem.characters(number: 10)}
  end