skylight 2.0.2 → 3.0.0.beta

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35a3e340018201709e91ddf7f30e856d1a3de642ce6b6b7c42d2c3c3b9e882ec
-  data.tar.gz: 31d386041d58b1a7142aebb5794351ae5ba088fb879c6a0e0c17e53314dbfa7c
+  metadata.gz: c9d371e3b8cc2f1e570e61130d352215e51107f6861840b1f2476c9c3e1a46ab
+  data.tar.gz: b037f983a6416f9af147156aab819a694a84e35ee0bc319d76578653a3186964
 SHA512:
-  metadata.gz: 557791c4449bb7e8086d5448b35ec717b39467091acd7c3ae92f5204bfb875d7775761c9bad2b281814883a035bf9b9cbf8a53b82dd154f752210e6cbdb3088a
-  data.tar.gz: f47d551e37065641dcb170cfb487ff92cb572c60ca0e8b4f9079aebad87a2ff365006e1d007b146aac7779e0e23ecca45767b24fb3266fbf4111c39d8d87926a
+  metadata.gz: 9370e806f12f02205d3911f3de966f95dbde20b7c808d5ce6f1aa5276ff0f213581fc3c1205b19419ee6d861c5e37c449816d07142052ad5e32f794dd531ce0a
+  data.tar.gz: a1cc78dda26938c4312da0f57067a170ffee7c6059edaa2d01955426c5f2d366d644bf889a80305e3c04bf424a8a2a0dbf9cbf9343a0ba94cf20e3d6cbddab9d

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 3.0.0-beta (August 2, 2018)
+
+* [BETA FEATURE] First class support for [multiple application environments](https://www.skylight.io/support/environments)
+* [IMPROVEMENT] Better instrumentation of ActiveJob enqueues
+
 ## 2.0.2 (June 4, 2018)
 
 * [IMPROVEMENT] Improve handling of broken middleware traces
@@ -229,7 +234,7 @@
 
 ## 0.8.0 (August 13, 2015)
 
-* [FEATURE] Add Grape instumentation. See http://docs.skylight.io/grape
+* [FEATURE] Add Grape instumentation. See https://docs.skylight.io/grape
 * [FEATURE] Process ERB in config/skylight.yml
 * [FEATURE] Add Rust based SQL lexing. Currently beta. Enable with `config.sql_mode = 'rust'`.
 * [BUGFIX] Fixed a case where, With some logger configurations, duplicate messages could be written to STDOUT.
@@ -254,7 +259,7 @@
 
 * [IMPROVEMENT] Eliminates runtime dependency on the Rails
   constant across the entire codebase
-* [FEATURE] Support for Sinatra applications. See http://docs.skylight.io/sinatra/
+* [FEATURE] Support for Sinatra applications. See https://docs.skylight.io/sinatra/
 * [FEATURE] Support for the Sequel ORM (off by default for Rails apps)
 * [FEATURE] Support for Tilt templates (off by default for Rails apps)
 
@@ -309,7 +314,7 @@
 
 ## 0.3.18 (July 17, 2014)
 
-* [FEATURE] Redis probe (Not enabled by default. See http://docs.skylight.io/agent/#railtie)
+* [FEATURE] Redis probe (Not enabled by default. See https://docs.skylight.io/agent/#railtie)
 * [FEATURE] Support app creation with token instead of email/password
 * [BUGFIX] App creation now works even when Webmock is enabled
 * [BUGFIX] Fix instrumentation for methods ending in special chars

data/README.md

@@ -1,5 +1,8 @@
 # Skylight Ruby Agent
 
+![Rubygems Version](https://img.shields.io/gem/v/skylight.svg)
+[![SemVer](https://api.dependabot.com/badges/compatibility_score?dependency-name=skylight&package-manager=bundler&version-scheme=semver)](https://dependabot.com/compatibility-score.html?dependency-name=skylight&package-manager=bundler&version-scheme=semver)
+
 Instrument your ruby application and send the data to the Skylight
 servers.
 
@@ -10,4 +13,4 @@ For more documentation see https://www.skylight.io/support.
 
 ## Bug Reports and Feature Requests
 
-If you've got a bug report or have a feature you'd like to request, please contact us at support@skylight.io or use the built-in messenger in the Skylight web interface. We'll be much quicker to respond that way :)
+If you've got a bug report or have a feature you'd like to request, please contact us at support@skylight.io or use the built-in messenger in the Skylight web interface. We'll be much quicker to respond that way :)

data/ext/libskylight.yml

@@ -1,8 +1,7 @@
----
-version: "2.0.0-b7a5dfb"
+version: "3.0.0-4e3325d"
 checksums:
-  x86-linux:         "9d0f7236869d27c4f3614fa3428271c1d5a1d5cb0a7ac42d6242610b0baa3295"
-  x86_64-linux:      "12a0ec3c8e74a23e38d4ccaf670a5d167e2d977075b89caf5f3e9b2274b83d4d"
-  x86_64-linux-musl: "23c0858b0a8e5aad5fb34f7417f677dadc37c66a874e9a43ffae32f6ed174ce6"
-  x86_64-darwin:     "0a62e2cca7b13b1663663a84071b1be428556c69f2eee74a2e698c8ada8b4381"
-  x86_64-freebsd:    "a3f10212dce2dbc4f169dbb1ec18c58ede4bbf324aa0bdbd9ff79fecc37b7423"
+  x86-linux:         "5f163ab012f92e4801783566e8d4804327448c603f57f4768d54de23f6c4768c"
+  x86_64-linux:      "9ad7672ed16fe7c7e54b19fc85fe22388f478872df11eacceb7d881397bb4061"
+  x86_64-linux-musl: "f9a30d85dd0a63def447622ecdf5dbbddd379b14947e0f2d5c6b26546b9e6514"
+  x86_64-darwin:     "85a0125a012de2d650b978b615a0a3c040894ed38eece293b5e467fd4a1bf2a4"
+  x86_64-freebsd:    "c563ecff9289c3a716791a477cc360cd30ab84c4bbc4f888534b2a9c4a422d55"

data/lib/skylight/api.rb

@@ -8,7 +8,10 @@ module Skylight
 
     attr_reader :config
 
-    class CreateFailed < StandardError
+    class Error < StandardError; end
+    class Unauthorized < Error; end
+    class Conflict < Error; end
+    class CreateFailed < Error
       attr_reader :res
 
       def initialize(res)
@@ -102,6 +105,21 @@ module Skylight
       res
     end
 
+    def fetch_mergeable_apps(token)
+      headers = { 'x-skylight-merge-token' => token }
+      http_request(:merges, :get, headers).tap do |res|
+        raise error_for_status(res.status).new("HTTP #{res.status}: #{res.body}") unless res.success?
+      end
+    end
+
+    def merge_apps!(token, app_guid:, component_guid:, environment:)
+      headers = { 'x-skylight-merge-token' => token }
+      body = { environment: environment, app_guid: app_guid, component_guid: component_guid }
+      http_request(:merges, :post, body, headers).tap do |res|
+        raise error_for_status(res.status).new("HTTP #{res.status}: #{res.body}") unless res.success?
+      end
+    end
+
     def validate_config
       res = http_request(:validation, :post, config)
       ConfigValidationResults.new(config, res)
@@ -116,6 +134,17 @@ module Skylight
       http.send(method, uri.path, *args)
     end
 
+    def error_for_status(code)
+      case code
+      when 401
+        Unauthorized
+      when 409
+        Conflict
+      else
+        Error
+      end
+    end
+
   end
 
 end

data/lib/skylight/cli.rb

@@ -8,6 +8,7 @@ require 'active_support/inflector'
 
 require 'skylight/cli/helpers'
 require 'skylight/cli/doctor'
+require 'skylight/cli/merger'
 
 module Skylight
   module CLI
@@ -16,6 +17,7 @@ module Skylight
       include Helpers
 
       register(Doctor, "doctor", "doctor", "Run some basic tests to look out for common problems")
+      register(Merger, "merge", "merge", "Merge one app into another (e.g., as a child environment)")
 
       desc "setup TOKEN", "Sets up a new app using the provided token"
       def setup(token)
@@ -35,7 +37,7 @@ to set it up as a new app in Skylight.
         config[:authentication] = res.get('app.token')
         config.write(config_path)
 
-        say "Congratulations. Your application is on Skylight! http://www.skylight.io", :green
+        say "Congratulations. Your application is on Skylight! https://www.skylight.io", :green
         say <<-OUT
 
 The application was registered for you and we generated a config file
@@ -47,7 +49,7 @@ The next step is for you to deploy your application to production. The
 easiest way is to just commit the config file to your source control
 repository and deploy from there. You can learn more about the process at:
 
-  http://docs.skylight.io/getting-set-up/#deployment
+  https://docs.skylight.io/getting-set-up/#deployment
 
 If you want to specify the authentication token as an environment variable,
 you should set the `SKYLIGHT_AUTHENTICATION` variable to:

data/lib/skylight/cli/merger.rb

@@ -0,0 +1,305 @@
+require 'ostruct'
+require 'skylight/util/http'
+require 'thor'
+require 'highline'
+
+module Skylight
+  module CLI
+    class Merger < Thor::Group
+      include Helpers
+
+      def self.banner
+        "#{basename} skylight merge MERGE_TOKEN"
+      end
+
+      STRINGS = {
+        get_token: 'get your merge token from `https://www.skylight.io/merging`',
+        unlisted: "My app isn't listed here :("
+      }
+
+      argument :merge_token, type: :string, desc: STRINGS[:get_token]
+
+      def welcome
+        say "\nHello! Welcome to the `skylight merge` CLI!\n", :green
+
+        say "This CLI is for Skylight users who already have Skylight Environments set up\n" \
+          "using the legacy method of creating a separate Skylight app per environment.\n" \
+          "Use this CLI to merge legacy environment apps into their parent apps as Environments."
+      end
+
+      def fetch_apps
+        say "\nFetching your apps from skylight.io..."
+        @apps = api.fetch_mergeable_apps(@merge_token).body
+
+        if @apps.count < 2
+          done!(
+            message: "It does not appear that you are the owner of enough apps (there's nothing we can merge).",
+            success: false
+          )
+        end
+      rescue Skylight::Api::Unauthorized
+        done!(
+          success: false,
+          message: "Provided merge token is invalid.\n" \
+            "Please #{STRINGS[:get_token]}" \
+            "and run `skylight merge <merge token>` again."
+        )
+      end
+
+      def ask_for_parent_app
+        @parents ||= begin
+          a = (@apps + [{ name: STRINGS[:unlisted], components: [], unlisted: true }])
+          a.each_with_object({}).with_index do |(app, h), i|
+            h[i + 1] = OpenStruct.new(app)
+          end
+        end
+
+        say "\nLet's begin!\n\n" \
+          "Please specify the \"parent\" app.\n" \
+          "In most cases, this will be the production app handling web requests.", :green
+
+        @parent_app = ask_for_app(@parents)
+      end
+
+      def confirm_parent
+        say "\nOk! The parent app is: #{@parent_app.name}", :green
+      end
+
+      def ask_for_child_app
+        say "Please specify the child app to be merged into the parent app as an Environment.", :green
+        @child_app = ask_for_app(children, &method(:format_component))
+      end
+
+      def confirm_child
+        say "\nOk! The child app is: #{set_color(format_component(@child_app), :yellow)}", :green
+      end
+
+      def ask_for_child_env
+        say "\nWhat environment is the child app?\n" \
+          "In many cases, this will be equivalent to the Rails " \
+          "environment, i.e., `development`.", :green
+
+        say "1. development"
+        say "2. staging"
+        say "3. [choose a different environment not listed here]"
+
+        i = ask("\nWhich number?").chomp.to_i
+
+        @child_env = case i
+                     when 1 then 'development'
+                     when 2 then 'staging'
+                     when 3
+                       specify_child_env
+                     else
+                       say("\nEh? Please enter 1, 2, or 3.", :red)
+                       ask_for_child_env
+                     end
+      end
+
+      def confirm_child_env
+        say "\nOk! The child environment will be: #{set_color(@child_env, :yellow)}"
+      end
+
+      def confirm_everything
+        say "\nOk! Now we're going to merge `#{set_color(format_component(@child_app), :yellow)}` " \
+          "into `#{set_color(@parent_app.name, :green)}` as `#{set_color(@child_env, :yellow)}`."
+      end
+
+      def do_confirm
+        proceed = ask("Proceed? [Y/n]", :yellow).chomp
+
+        case proceed.upcase
+        when "Y", ""
+          do_merge
+        when "N"
+          done!(
+            success: true,
+            message: "Ok, come back any time."
+          )
+        else
+          say("Please respond 'Y' to merge or 'n' to cancel.", :red)
+          do_confirm
+        end
+      end
+
+      def print_new_config_instructions
+        say "\nSuccess!\n", :green
+
+        say "=======================================================\n", :yellow
+
+        say "IMPORTANT!\n" \
+          "If you use a config/skylight.yml file to configure Skylight:\n", :yellow
+
+        say "The #@child_env environment for the #{@parent_app.name} app\n" \
+          "will now connect using the default authentication token for the app.\n" \
+          "Remove any environment-specific `authentication` configs from the\n" \
+          "#{@parent_app.name} #@child_env environment.\n", :yellow
+
+        say "If you're running in Rails and your Rails environment exactly matches `#@child_env`,\n" \
+          "set `report_rails_env: true` to allow the agent to detect and report that\n" \
+          "environment when it connects.\n" \
+          "Otherwise, you should set `env: '#@child_env'` as environment-specific configuration for\n" \
+          "#@child_env's Rails environment. For example:\n" \
+          "```yml\n" \
+          "staging:\n" \
+          "  env: staging-42\n" \
+          "```\n", :yellow
+          # TODO: https://github.com/tildeio/direwolf-agent/issues/380
+          # report_rails_env above is for beta only. Update for final release
+          # "we will automatically detect and report that environment when your agent connects.\n"
+
+        say "=======================================================\n", :yellow
+
+        say "IMPORTANT!\n" \
+            "If you configure Skylight using environment variables:\n", :yellow
+
+        say "Deploy the latest agent before updating your environment variables.\n", :yellow
+
+        say "The #@child_env environment for the #{@parent_app.name} app\n" \
+          "will now connect using the default authentication token for the app.\n" \
+          "Set `SKYLIGHT_AUTHENTICATION` in the #@child_env environment to the\n" \
+          "#{@parent_app.name} app's authentication token.\n", :yellow
+
+        say "If you're running in Rails and your Rails environment exactly matches `#@child_env`,\n" \
+          "set `SKYLIGHT_REPORT_RAILS_ENV=true` to allow the agent to detect and report\n" \
+          "that environment when it connects.\n" \
+          "Otherwise, you should set `SKYLIGHT_ENV=#@child_env` when running in this environment.\n", :yellow
+          # TODO: https://github.com/tildeio/direwolf-agent/issues/380
+          # SKYLIGHT_REPORT_RAILS_ENV above is for beta only. Update for final release
+          # "we will automatically detect and report that environment when your agent connects.\n"
+
+        say "=======================================================", :yellow
+
+        done!
+      end
+
+      private
+
+      def do_merge
+        say "Merging..."
+
+        api.merge_apps!(@merge_token,
+                        app_guid: @parent_app.guid,
+                        component_guid: @child_app.guid,
+                        environment: @child_env
+                       )
+      rescue => e
+        say("Something went wrong. Please contact support@skylight.io for more information.", :red)
+        done!(message: e.message, success: false)
+      end
+
+      def done!(message: nil, success: true)
+        shell.padding = 0
+        say "\n"
+
+        if success
+          say(message, :green) if message
+          say "If you have any questions, please contact support@skylight.io.", :green
+          exit 0
+        else
+          say message || "Skylight wasn't able to merge your apps.", :red
+          say "If you have any questions, please contact support@skylight.io.", :yellow
+          exit 1
+        end
+      end
+
+      def ask_for_app(app_list, &formatter)
+        formatter ||= :name.to_proc
+        app_list.each do |index, app|
+          say("\t#{index}. #{formatter.(app)}")
+        end
+
+        n = ask("\nWhich number?").chomp.to_i
+
+        if !app_list.key?(n)
+          say "\nHmm?"
+          ask_for_app(app_list, &formatter)
+        elsif app_list[n].unlisted
+          done!(
+            success: false,
+            message: "Sorry, `skylight merge` is only able to merge apps that you own."
+          )
+        else
+          app_list[n]
+        end
+      end
+
+      def api
+        @api ||= Skylight::Api.new(config)
+      end
+
+      def format_component(component)
+        parts = [].tap do |ary|
+          ary << component.name unless component.name == 'web'
+          ary << component.environment unless component.environment == 'production'
+        end
+
+        str = ''
+        str << component.app_name
+        str << Thor::Shell::Color.new.set_color(" (#{parts.join(':')})", :yellow) if parts.any?
+        str
+      end
+
+      def validate_mergeability(child_app, child_env)
+        errors = []
+
+        unless valid_component?(child_app.name, child_env)
+          errors << "Environment can only contain letters, numbers, and hyphens."
+        end
+
+        if @parent_app && parent_component_fingerprints.include?([child_app.name, child_env])
+          errors << "Sorry, `#{@parent_app.name}` already has a `#{child_env}` " \
+            "component that conflicts with this merge request. Please choose a new environment."
+        end
+
+        return child_env unless errors.any?
+
+        say errors.join("\n"), :red
+
+        yield
+      end
+
+      def valid_component?(component_name, env)
+        return false unless env
+        Skylight::Util::Component.new(env, component_name) && true
+      rescue ArgumentError
+        false
+      end
+
+      def parent_component_fingerprints
+        @parent_app.components.map { |x| x.values_at('name', 'environment') }
+      end
+
+      def children
+        Enumerator.new do |yielder|
+          @parents.each do |_, app|
+            next if app == @parent_app
+            app.components.each do |component|
+              yielder << OpenStruct.new({ app_name: app.name }.merge(component))
+            end
+          end
+
+          yielder << OpenStruct.new({ app_name: STRINGS[:unlisted], unlisted: true })
+        end.each_with_object({}).with_index do |(c, r), i|
+          r[i + 1] = c
+        end.tap do |result|
+          if result.values.all?(&:unlisted)
+            done!(
+              success: false,
+              message: "Sorry, you do not have any apps that can be merged into `#{@parent_app.name}`"
+            )
+          end
+        end
+      end
+
+      def specify_child_env
+        validate_mergeability(
+          @child_app,
+          ask("Please enter your environment name (only lowercase letters, numbers, or hyphens): ", :green).chomp
+        ) do
+          specify_child_env
+        end
+      end
+    end
+  end
+end

data/lib/skylight/config.rb

@@ -1,4 +1,5 @@
 require 'openssl'
+require 'skylight/util/component'
 require 'skylight/util/deploy'
 require 'skylight/core/util/platform'
 require 'skylight/util/hostname'
@@ -17,6 +18,11 @@ module Skylight
         'HOSTNAME'      => :hostname,
         'SESSION_TOKEN' => :session_token,
 
+        # == Component settings ==
+        'ENV' => :'component.environment',
+        'COMPONENT' => :'component.name',
+        'REPORT_RAILS_ENV' => :report_rails_env,
+
         # == Deploy settings ==
         'DEPLOY_ID'          => :'deploy.id',
         'DEPLOY_GIT_SHA'     => :'deploy.git_sha',
@@ -35,6 +41,7 @@ module Skylight
         # == Skylight Remote ==
         "AUTH_URL"                     => :auth_url,
         "APP_CREATE_URL"               => :app_create_url,
+        "MERGES_URL"                   => :merges_url,
         "VALIDATION_URL"               => :validation_url,
         "AUTH_HTTP_DEFLATE"            => :auth_http_deflate,
         "AUTH_HTTP_CONNECT_TIMEOUT"    => :auth_http_connect_timeout,
@@ -43,6 +50,7 @@ module Skylight
         "REPORT_HTTP_DEFLATE"          => :report_http_deflate,
         "REPORT_HTTP_CONNECT_TIMEOUT"  => :report_http_connect_timeout,
         "REPORT_HTTP_READ_TIMEOUT"     => :report_http_read_timeout,
+        "REPORT_HTTP_DISABLED"         => :report_http_disabled,
 
         # == Native agent settings ==
         #
@@ -80,11 +88,13 @@ module Skylight
         ret = super.merge(
           :auth_url             => 'https://auth.skylight.io/agent',
           :app_create_url       => 'https://www.skylight.io/apps',
+          :merges_url           => 'https://www.skylight.io/merges',
           :validation_url       => 'https://auth.skylight.io/agent/config',
           :'daemon.lazy_start'  => true,
           :hostname             => Util::Hostname.default_hostname,
           :use_old_sql_lexer    => false,
-          :report_max_spans_exceeded => false
+          :report_max_spans_exceeded => false,
+          :report_rails_env     => true,
         )
 
         if Core::Util::Platform::OS != 'darwin'
@@ -126,6 +136,7 @@ module Skylight
         :report_http_deflate,
         :report_http_connect_timeout,
         :report_http_read_timeout,
+        :report_http_disabled,
         :'daemon.lazy_start',
         :'daemon.exec_path',
         :'daemon.lib_path',
@@ -243,7 +254,7 @@ module Skylight
     def to_native_env
       ret = super
 
-      ret << "SKYLIGHT_AUTHENTICATION" << authentication_with_deploy
+      ret << "SKYLIGHT_AUTHENTICATION" << authentication_with_meta
       ret << "SKYLIGHT_VALIDATE_AUTHENTICATION" << "false"
 
       ret
@@ -267,14 +278,18 @@ authentication: #{self[:authentication]}
     #
     #
 
-    def authentication_with_deploy
+    def authentication_with_meta
       token = get(:authentication)
 
-      if token && deploy
-        deploy_str = deploy.to_query_string
+      if token
+        meta = { }
+        meta.merge!(deploy.to_query_hash) if deploy
+        meta[:component] = component.to_s if component
+        meta[:reporting_env] = true if reporting_env?
+
         # A pipe should be a safe delimiter since it's not in the standard token
         # and is encoded by URI
-        token += "|#{deploy_str}"
+        token += "|#{URI.encode_www_form(meta)}"
       end
 
       token
@@ -284,6 +299,13 @@ authentication: #{self[:authentication]}
       @deploy ||= Util::Deploy.build(self)
     end
 
+    def component
+      @component ||= Util::Component.new(get(:'component.environment'),
+                                         get(:'component.name'))
+    rescue ArgumentError => e
+      raise Core::ConfigError, e.message
+    end
+
   private
 
     def check_nfs(path)
@@ -291,5 +313,10 @@ authentication: #{self[:authentication]}
       `stat -f -L -c %T #{path} 2>&1`.strip == 'nfs'
     end
 
+    def reporting_env?
+      # true if component.environment was explicitly set,
+      # or if we are auto-detecting via the opt-in SKYLIGHT_REPORT_RAILS_ENV=true
+      !!(get(:report_rails_env) || get(:'component.environment'))
+    end
   end
 end

data/lib/skylight/railtie.rb

@@ -19,7 +19,7 @@ module Skylight
     #   net_http, action_controller, action_dispatch, action_view, and middleware are on by default
     #   See https://www.skylight.io/support/getting-more-from-skylight#available-instrumentation-options
     #   for a full list.
-    config.skylight.probes = ['net_http', 'action_controller', 'action_dispatch', 'action_view', 'middleware']
+    config.skylight.probes = ['net_http', 'action_controller', 'action_dispatch', 'action_view', 'middleware', 'active_job_enqueue']
 
     # The position in the middleware stack to place Skylight
     # Default is first, but can be `{ after: Middleware::Name }` or `{ before: Middleware::Name }`
@@ -35,5 +35,13 @@ module Skylight
         super + "\n(To disable this message for all local apps, run `skylight disable_dev_warning`.)"
       end
 
+      def load_skylight_config(app)
+        super.tap do |config|
+          if config[:report_rails_env]
+            config[:'component.environment'] ||= Rails.env.to_s
+          end
+        end
+      end
+
   end
 end

data/lib/skylight/util/component.rb

@@ -0,0 +1,33 @@
+module Skylight
+  module Util
+    class Component
+
+      attr_accessor :environment, :name
+
+      NAME_FORMAT = /\A[a-z0-9-]+\z/
+      DEFAULT_NAME = 'web'.freeze
+      DEFAULT_ENVIRONMENT = 'production'.freeze
+
+      def initialize(environment, name)
+        @environment = environment || DEFAULT_ENVIRONMENT
+        @name        = name || DEFAULT_NAME
+
+        raise ArgumentError, "environment can't be blank" if @environment.empty?
+        validate_string!(@environment, 'environment')
+        validate_string!(@name, 'name')
+      end
+
+      def to_s
+        "#{name}:#{environment}"
+      end
+
+      private
+
+      def validate_string!(string, kind)
+        return true if string =~ NAME_FORMAT
+        raise ArgumentError, "#{kind} can only contain lowercase letters, numbers, and dashes"
+      end
+    end
+  end
+end
+

data/lib/skylight/util/deploy.rb

@@ -1,5 +1,4 @@
 require 'json'
-require 'uri'
 require 'skylight/core/util/logging'
 
 module Skylight
@@ -37,14 +36,14 @@ module Skylight
           nil
         end
 
-        def to_query_string
+        def to_query_hash
           hash = {
             timestamp:   timestamp,
             deploy_id:   id.to_s[0..100] # Keep this sane
           }
           hash[:git_sha] = git_sha[0..40] if git_sha # A valid SHA will never exceed 40
           hash[:description] = description[0..255] if description # Avoid massive descriptions
-          URI.encode_www_form(hash)
+          hash
         end
 
       end

data/lib/skylight/version.rb

@@ -1,4 +1,4 @@
 module Skylight
-  VERSION = '2.0.2'
+  VERSION = '3.0.0-beta'
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 3.0.0.beta
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-04 00:00:00.000000000 Z
+date: 2018-08-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: skylight-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.0.beta
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.2
+        version: 3.0.0.beta
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: puma
+  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: rack-test
   requirement: !ruby/object:Gem::Requirement
@@ -176,6 +190,7 @@ files:
 - lib/skylight/cli.rb
 - lib/skylight/cli/doctor.rb
 - lib/skylight/cli/helpers.rb
+- lib/skylight/cli/merger.rb
 - lib/skylight/config.rb
 - lib/skylight/data/cacert.pem
 - lib/skylight/errors.rb
@@ -188,6 +203,7 @@ files:
 - lib/skylight/railtie.rb
 - lib/skylight/sinatra.rb
 - lib/skylight/trace.rb
+- lib/skylight/util/component.rb
 - lib/skylight/util/deploy.rb
 - lib/skylight/util/hostname.rb
 - lib/skylight/util/http.rb
@@ -232,7 +248,7 @@ files:
 - lib/skylight/vendor/cli/thor/util.rb
 - lib/skylight/vendor/cli/thor/version.rb
 - lib/skylight/version.rb
-homepage: http://www.skylight.io
+homepage: https://www.skylight.io
 licenses:
 - Nonstandard
 metadata: {}
@@ -247,9 +263,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: 2.2.7
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.7.6