skylight 4.1.1.beta → 4.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdfdccaa0d3d3b5163035985d500bee74aa687de5c8e3e8f58e661684131d8ea
-  data.tar.gz: 85118921b59286d9417ce14b3078ce34b77c34b2bb7a103979a3b3612127ea80
+  metadata.gz: f64e1b1239d675cc682acad27c824044973a5e40fe85dffe61a6372b3b854c27
+  data.tar.gz: 26330aa2c1c0a8f3e30572e18654ecf35d7d5312c9ca250cb66eaa451ed0bac8
 SHA512:
-  metadata.gz: db7577c627384f1ffdb99fd4c442f00acb753cd5d612b2cb2ee58988edd7085cda9378858df850082077e26bd1cbfe4835b83f5fccc68752de2606d8fd1caf90
-  data.tar.gz: 550a3ff7eb92ae32a60bbf04286358540b387de49863a9df8b9ce5388c9e56691b24351bc5c923e2bdcb744d4a7351bb47b7251427db8b2cab6172ef0ae12e5e
+  metadata.gz: 1567acdadba55a0028ca5d9da33cd9befbaed5b6acd01e3320d2820baa5ab002758c27e2d60e76bc9da24574f224abe94f5eabbdf03d6cdad136b811611aa364
+  data.tar.gz: 8593278ddfbde56d6661f3e927a255385c64a5732a4d8040ed74ba5dedfcbcffd46095f8d099d44425d672e6be3ae4a01249948bd6bf1e58f802fd2e81791727

data/CHANGELOG.md

@@ -1,4 +1,5 @@
-## 4.1.1-beta
+## 4.1.1
+* [BUGFIX] Fix Skylight installation when bundled with edge rails [Issue #132](https://github.com/skylightio/skylight-ruby/issues/132)
 * [IMPROVEMENT] Improve socket retry handling in skylightd
 
 ## 4.1.0 (June 3, 2019)

data/ext/extconf.rb

@@ -6,19 +6,8 @@ require "fileutils"
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
-require "skylight/version"
-
-# Don't use the gem for dev
-if File.exist?(File.expand_path("../Gemfile", __dir__))
-  # This approach won't work in production since skylight-core isn't in the skylight gem
-  $LOAD_PATH.unshift File.expand_path("../skylight-core/lib", __dir__)
-else
-  # Is there a better way to get this into lib?
-  gem "skylight-core", Skylight::VERSION.tr("-", ".")
-end
-
 require "skylight/native_ext_fetcher"
-require "skylight/core/util/platform"
+require "skylight/util/platform"
 
 # Util allowing proxying writes to multiple location
 class MultiIO
@@ -35,7 +24,7 @@ class MultiIO
   end
 end
 
-include Skylight::Core::Util
+include Skylight::Util
 
 SKYLIGHT_INSTALL_LOG = File.expand_path("install.log", __dir__)
 SKYLIGHT_REQUIRED   = ENV.key?("SKYLIGHT_REQUIRED") && ENV["SKYLIGHT_REQUIRED"] !~ /^false$/i

data/lib/skylight/cli/doctor.rb

@@ -184,7 +184,7 @@ module Skylight
         end
 
         def mac?
-          Core::Util::Platform::OS == "darwin"
+          Util::Platform::OS == "darwin"
         end
 
         # NOTE: This check won't work correctly on Windows

data/lib/skylight/config.rb

@@ -1,7 +1,7 @@
 require "openssl"
 require "skylight/util/component"
 require "skylight/util/deploy"
-require "skylight/core/util/platform"
+require "skylight/util/platform"
 require "skylight/util/hostname"
 require "skylight/util/ssl"
 
@@ -94,7 +94,7 @@ module Skylight
           report_rails_env:           true
         )
 
-        if Core::Util::Platform::OS != "darwin"
+        unless Util::Platform::OS == "darwin"
           ret[:'daemon.ssl_cert_path'] = Util::SSL.ca_cert_file_or_default
           ret[:'daemon.ssl_cert_dir'] = Util::SSL.ca_cert_dir
         end

data/lib/skylight/native.rb

@@ -1,4 +1,4 @@
-require "skylight/core/util/platform"
+require "skylight/util/platform"
 
 module Skylight
   # @api private
@@ -10,14 +10,14 @@ module Skylight
   end
 
   def self.libskylight_path
-    ENV["SKYLIGHT_LIB_PATH"] || File.expand_path("../native/#{Core::Util::Platform.tuple}", __FILE__)
+    ENV["SKYLIGHT_LIB_PATH"] || File.expand_path("../native/#{Util::Platform.tuple}", __FILE__)
   end
 
   skylight_required = ENV.key?("SKYLIGHT_REQUIRED") && ENV["SKYLIGHT_REQUIRED"] !~ /^false$/i
 
   begin
     unless ENV.key?("SKYLIGHT_DISABLE_AGENT") && ENV["SKYLIGHT_DISABLE_AGENT"] !~ /^false$/i
-      lib = "#{libskylight_path}/libskylight.#{Core::Util::Platform.libext}"
+      lib = "#{libskylight_path}/libskylight.#{Util::Platform.libext}"
 
       if File.exist?(lib)
         # First attempt to require the native extension

data/lib/skylight/native_ext_fetcher.rb

@@ -5,7 +5,7 @@ require "fileutils"
 require "digest/sha2"
 require "open3"
 require "skylight/util/ssl"
-require "skylight/core/util/proxy"
+require "skylight/util/proxy"
 
 # Used from extconf.rb
 module Skylight
@@ -137,7 +137,7 @@ module Skylight
     #
     # If `ENV['HTTP_PROXY']` is set, it will be used as a proxy for this request.
     def http_get(host, port, use_ssl, path, out)
-      if (http_proxy = Core::Util::Proxy.detect_url(ENV))
+      if (http_proxy = Util::Proxy.detect_url(ENV))
         log "connecting with proxy: #{http_proxy}"
         uri = URI.parse(http_proxy)
         p_host = uri.host

data/lib/skylight/util/platform.rb

@@ -0,0 +1,78 @@
+require "rbconfig"
+
+# Used from extconf and to load libskylight
+module Skylight
+  module Util
+    module Platform
+      # Normalize the platform OS
+      OS =
+        case os = RbConfig::CONFIG["host_os"].downcase
+        when /linux/
+          # The official ruby-alpine Docker containers pre-build Ruby. As a result,
+          #   Ruby doesn't know that it's on a musl-based platform. `ldd` is the
+          #   only reliable way to detect musl that we've found.
+          # See https://github.com/skylightio/skylight-ruby/issues/92
+          if ENV["SKYLIGHT_MUSL"] || `ldd --version 2>&1` =~ /musl/
+            "linux-musl"
+          else
+            "linux"
+          end
+        when /darwin/
+          "darwin"
+        when /freebsd/
+          "freebsd"
+        when /netbsd/
+          "netbsd"
+        when /openbsd/
+          "openbsd"
+        when /sunos|solaris/
+          "solaris"
+        when /mingw|mswin/
+          "windows"
+        else
+          os
+        end
+
+      # Normalize the platform CPU
+      ARCH =
+        case cpu = RbConfig::CONFIG["host_cpu"].downcase
+        when /amd64|x86_64/
+          "x86_64"
+        when /i?86|x86|i86pc/
+          "x86"
+        when /ppc|powerpc/
+          "powerpc"
+        when /^arm/
+          "arm"
+        else
+          cpu
+        end
+
+      LIBEXT =
+        case OS
+        when /darwin/
+          "dylib"
+        when /linux|bsd|solaris/
+          "so"
+        when /windows|cygwin/
+          "dll"
+        else
+          "so"
+        end
+
+      TUPLE = "#{ARCH}-#{OS}".freeze
+
+      def self.tuple
+        TUPLE
+      end
+
+      def self.libext
+        LIBEXT
+      end
+
+      def self.dlext
+        RbConfig::CONFIG["DLEXT"]
+      end
+    end
+  end
+end

data/lib/skylight/util/proxy.rb

@@ -0,0 +1,13 @@
+module Skylight
+  module Util
+    module Proxy
+      def self.detect_url(env)
+        u = env["HTTP_PROXY"] || env["http_proxy"]
+        if u && !u.empty?
+          u = "http://#{u}" unless u =~ %r{://}
+          u
+        end
+      end
+    end
+  end
+end

data/lib/skylight/version.rb

@@ -1,3 +1,3 @@
 module Skylight
-  VERSION = "4.1.1-beta".freeze
+  VERSION = "4.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 4.1.1.beta
+  version: 4.1.1
 platform: ruby
 authors:
 - Tilde, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: skylight-core
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1.beta
+        version: 4.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.1.beta
+        version: 4.1.1
 - !ruby/object:Gem::Dependency
   name: beefcake
   requirement: !ruby/object:Gem::Requirement
@@ -207,6 +207,8 @@ files:
 - lib/skylight/util/deploy.rb
 - lib/skylight/util/hostname.rb
 - lib/skylight/util/http.rb
+- lib/skylight/util/platform.rb
+- lib/skylight/util/proxy.rb
 - lib/skylight/util/ssl.rb
 - lib/skylight/vendor/cli/highline.rb
 - lib/skylight/vendor/cli/highline/color_scheme.rb
@@ -263,9 +265,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.3'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubygems_version: 3.0.3
 signing_key: