front_end_builds 0.2.1 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: deb6494fa7c87243c2cf1106f7f31d27a68f9e10
-  data.tar.gz: 0ee7d06cadb1af53a1a8c3cb17d3494bddf4b774
+SHA256:
+  metadata.gz: e63d1f6aedb627517cce00a61a0b3318589611bec299bff195426a0f0ba95ea7
+  data.tar.gz: 12e4734b74b1c1156dac188a6e0f8dc5d0b6821660784c980b649918ee835cad
 SHA512:
-  metadata.gz: 11df0ba3e09503049bc8c76ca2607a3bf924716739d6ffd7c055c3a2913208a19367277bf790c9af1f6c306bb444452045825a4c64e54642bfad670c5e6ad94d
-  data.tar.gz: 7e99f78c40995ce4fbd0bb568b0e6bf28b3e075bd4f642121d5a162eef36d1f51516f4f354e42e1e52360104c3acb6309995395ab0d8ce7d49acc4139e7e3dbf
+  metadata.gz: 8fee953eb09c4e60ec55bf7bef38281f6c79e15c9d651e3a5d8ffd3b28b1afd5b7eb357f58ea9a651b840f79b22e0267af0845685f94ef800fc39eb7c3b2fc14
+  data.tar.gz: 15fc02a719a4501d2c8cd7d53c28f2138d74be516c6414a0089dadd6047fb114a33797631911414ed2d217ba6337d289d3b028621d208d6a72e703c3c38338aa

data/Rakefile

@@ -25,7 +25,7 @@ end
 namespace :admin do
   task :build do
     Dir.chdir('admin') do
-      sh 'ember build  --environment=production'
+      sh 'ember build production'
     end
 
     # Copy the dist to public

data/app/controllers/front_end_builds/admin_controller.rb

@@ -15,7 +15,7 @@ module FrontEndBuilds
       html = html.sub('BASEURL/', baseURL)
       html = html.sub("baseURL: ''", "baseURL: '#{baseURL}'")
 
-      render text: html
+      render plain: html
     end
 
   end

data/app/controllers/front_end_builds/application_controller.rb

@@ -1,11 +1,6 @@
 module FrontEndBuilds
   class ApplicationController < ActionController::Base
 
-    def use_params(param_method)
-      v = Rails::VERSION::MAJOR
-      send("#{param_method}_rails_#{v}")
-    end
-
     # Public: A quick helper to create a respond_to block for
     # returning json to the client. Used because `respond_with`
     # is no longer included in Rails.
@@ -20,6 +15,5 @@ module FrontEndBuilds
     def error!(errors, status = :unprocessable_entity)
       respond_with_json({ errors: errors }, status: status)
     end
-
   end
 end

data/app/controllers/front_end_builds/apps_controller.rb

@@ -2,11 +2,10 @@ require_dependency "front_end_builds/application_controller"
 
 module FrontEndBuilds
   class AppsController < ApplicationController
-    before_filter :set_app , :only => [:show, :destroy, :update]
+    before_action :set_app , :only => [:show, :destroy, :update]
 
     def index
       apps = App.includes(:recent_builds)
-
       respond_with_json({
         apps: apps.map(&:serialize),
         builds: apps.map(&:recent_builds)
@@ -23,7 +22,7 @@ module FrontEndBuilds
     end
 
     def create
-      @app = FrontEndBuilds::App.new( use_params(:app_create_params) )
+      @app = FrontEndBuilds::App.new( app_create_params )
 
       if @app.save
         respond_with_json(
@@ -39,7 +38,7 @@ module FrontEndBuilds
     end
 
     def update
-      if @app.update_attributes( use_params(:app_update_params) )
+      if @app.update_attributes( app_update_params )
 
         respond_with_json(
           { app: @app.serialize },
@@ -61,7 +60,7 @@ module FrontEndBuilds
         )
       else
         respond_with_json(
-          {errors: @app.errors},
+          { errors: @app.errors },
           status: :unprocessable_entity
         )
       end
@@ -73,31 +72,18 @@ module FrontEndBuilds
       @app = FrontEndBuilds::App.find(params[:id])
     end
 
-    def app_create_params_rails_3
-      params[:app].slice(:name)
-    end
-
-    def app_create_params_rails_4
+    def app_create_params
       params.require(:app).permit(
         :name
       )
     end
 
-    def app_update_params_rails_3
-      params[:app].slice(
-        :name,
-        :require_manual_activation,
-        :live_build_id
-      )
-    end
-
-    def app_update_params_rails_4
+    def app_update_params
       params.require(:app).permit(
         :name,
         :require_manual_activation,
         :live_build_id
       )
     end
-
   end
 end

data/app/controllers/front_end_builds/bests_controller.rb

@@ -11,17 +11,17 @@ module FrontEndBuilds
   class BestsController < ApplicationController
     include Rails.application.routes.url_helpers
 
-    before_filter :find_front_end, only: [:show]
+    before_action :find_front_end, only: [:show]
 
     def show
       if @front_end
         respond_to do |format|
-          format.html { render text: @front_end.with_head_tag(meta_tags) }
+          format.html { render plain: @front_end.with_head_tag(meta_tags) }
           format.json { render json: { version: @front_end.id } }
         end
       else
         # TODO install instructions, user needs to push build
-        render text: "not found", status: 404
+        render plain: "not found", status: 404
       end
     end
 
@@ -33,10 +33,10 @@ module FrontEndBuilds
         csrf_param: request_forgery_protection_token,
         csrf_token: form_authenticity_token,
         front_end_build_version: @front_end.id,
-        front_end_build_params: use_params(:build_search_params).to_query,
+        front_end_build_params: build_search_params.to_h.to_query,
         front_end_build_url: front_end_builds_best_path(
-            use_params(:build_search_params).merge(format: :json)
-          )
+          build_search_params.merge(format: :json)
+        )
       }
 
       tags
@@ -48,14 +48,10 @@ module FrontEndBuilds
     end
 
     def find_front_end
-      @front_end = FrontEndBuilds::Build.find_best(use_params(:build_search_params))
+      @front_end = FrontEndBuilds::Build.find_best(build_search_params)
     end
 
-    def build_search_params_rails_3
-      params.slice(:app_name, :id, :branch, :sha, :job)
-    end
-
-    def build_search_params_rails_4
+    def build_search_params
       params.permit(:app_name, :id, :branch, :sha, :job)
     end
   end

data/app/controllers/front_end_builds/builds_controller.rb

@@ -2,7 +2,7 @@ require_dependency "front_end_builds/application_controller"
 
 module FrontEndBuilds
   class BuildsController < ApplicationController
-    before_filter :set_app!, only: [:create]
+    before_action :set_app!, only: [:create]
 
     def index
       builds = FrontEndBuilds::Build.where(app_id: params[:app_id])
@@ -12,7 +12,7 @@ module FrontEndBuilds
     end
 
     def create
-      build = @app.builds.new(use_params(:build_create_params))
+      build = @app.builds.new(build_create_params)
 
       if build.verify && build.save
         build.setup!
@@ -22,7 +22,7 @@ module FrontEndBuilds
         build.errors[:base] << 'No access - invalid SSH key' if !build.verify
 
         render(
-          text: 'Could not create the build: ' + build.errors.full_messages.to_s,
+          plain: 'Could not create the build: ' + build.errors.full_messages.to_s,
           status: :unprocessable_entity
         )
       end
@@ -45,7 +45,7 @@ module FrontEndBuilds
 
       if @app.nil?
         render(
-          text: "No app named #{params[:app_name]}.",
+          plain: "No app named #{params[:app_name]}.",
           status: :unprocessable_entity
         )
 
@@ -64,11 +64,7 @@ module FrontEndBuilds
       ]
     end
 
-    def build_create_params_rails_3
-      params.slice(*_create_params)
-    end
-
-    def build_create_params_rails_4
+    def build_create_params
       params.permit(*_create_params)
     end
   end

data/app/controllers/front_end_builds/pubkeys_controller.rb

@@ -8,8 +8,7 @@ module FrontEndBuilds
     end
 
     def create
-      pubkey = FrontEndBuilds::Pubkey
-        .new( use_params(:pubkey_create_params) )
+      pubkey = FrontEndBuilds::Pubkey.new(pubkey_create_params)
 
       if pubkey.save
         respond_with_json(
@@ -36,11 +35,7 @@ module FrontEndBuilds
 
     private
 
-    def pubkey_create_params_rails_3
-      params[:pubkey].slice(:name, :pubkey)
-    end
-
-    def pubkey_create_params_rails_4
+    def pubkey_create_params
       params.require(:pubkey).permit(
         :name,
         :pubkey

data/lib/front_end_builds/engine.rb

@@ -6,7 +6,7 @@ module FrontEndBuilds
 
     config.generators do |g|
       g.test_framework :rspec, fixture: false
-      g.fixture_replacement :factory_girl, dir: 'spec/factories'
+      g.fixture_replacement :factory_bot, dir: 'spec/factories'
       g.assets false
       g.helper false
     end

data/lib/front_end_builds/utils/ssh_pubkey_convert.rb

@@ -3,6 +3,9 @@
 #
 # https://github.com/mytestbed/omf/blob/master/omf_common/lib/omf_common/auth/ssh_pub_key_convert.rb
 #
+# Support for DSA keys was removed from this code as the FEB app doesn't support DSA keys
+# See PubKey#verify
+#
 
 module FrontEndBuilds
   module Utils
@@ -66,27 +69,21 @@ module FrontEndBuilds
           (nstr, bytes) = unpack_string(bytes, n)
 
           key = OpenSSL::PKey::RSA.new
-          key.n = OpenSSL::BN.new(nstr, 2)
-          key.e = OpenSSL::BN.new(estr, 2)
-          key
-        elsif keytype == 'ssh-dss'
-          (n, bytes) = unpack_u32(bytes)
-          (pstr, bytes) = unpack_string(bytes, n)
-          (n, bytes) = unpack_u32(bytes)
-          (qstr, bytes) = unpack_string(bytes, n)
-          (n, bytes) = unpack_u32(bytes)
-          (gstr, bytes) = unpack_string(bytes, n)
-          (n, bytes) = unpack_u32(bytes)
-          (pkstr, bytes) = unpack_string(bytes, n)
 
-          key = OpenSSL::PKey::DSA.new
-          key.p = OpenSSL::BN.new(pstr, 2)
-          key.q = OpenSSL::BN.new(qstr, 2)
-          key.g = OpenSSL::BN.new(gstr, 2)
-          key.pub_key = OpenSSL::BN.new(pkstr, 2)
+          # support SSL 2
+          if Gem::Version.new(OpenSSL::VERSION) < Gem::Version.new('2.0.0')
+            key.n = OpenSSL::BN.new(nstr, 2)
+            key.e = OpenSSL::BN.new(estr, 2)
+          else
+            # params are n, e, d
+            key.set_key(OpenSSL::BN.new(nstr, 2), OpenSSL::BN.new(estr, 2), nil)
+          end
+
           key
         else
-          nil
+          # anything non-RSA is not supported
+          # this part edited by TED
+          raise "Unsupported key type: #{keytype}"
         end
       end
     end

data/lib/front_end_builds/version.rb

@@ -1,3 +1,3 @@
 module FrontEndBuilds
-  VERSION = "0.2.1"
+  VERSION = "1.0.0"
 end

metadata

@@ -1,18 +1,33 @@
 --- !ruby/object:Gem::Specification
 name: front_end_builds
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 1.0.0
 platform: ruby
 authors:
 - Ryan Toronto
 - Sam Selikoff
+- John Hirbour
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-03-15 00:00:00.000000000 Z
+date: 2019-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sqlite3
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+- !ruby/object:Gem::Dependency
+  name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -26,21 +41,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-rails
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec-its
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -54,7 +69,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: factory_girl_rails
+  name: factory_bot_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,6 +110,76 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-readline
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec-its
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shoulda-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -109,6 +194,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.7.0
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -127,6 +226,7 @@ description: Rails engine to manage front end builds and deployments
 email:
 - rt@ted.com
 - sam@ted.com
+- gohn@ted.com
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -194,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Summary of FrontEndBuilds.