skylight 0.0.14 → 0.0.15

data/lib/skylight/cli.rb

@@ -8,8 +8,8 @@ require "active_support/inflector"
 
 module Skylight
   class CLI < Thor
-    desc "create", "Create a new app"
-    def create
+    desc "setup", "Sets up a new app"
+    def setup
       if !SanityChecker.new.smoke_test(File.expand_path("config/skylight.yml"))
         say "Your app is already on Skylight. http://www.skylight.io", :green
         return
@@ -53,12 +53,12 @@ module Skylight
 
       loop do
         h = HighLine.new
-        username = h.ask("Username: ")
+        email = h.ask("Email: ")
         password = h.ask("Password: ") { |q| q.echo = "*" }
 
-        response = Util::HTTP.new(http_config).auth(username, password)
+        response = Util::HTTP.new(http_config).auth(email, password)
         if response["authenticated"] == false
-          say "Sorry. That username and password was invalid. Please try again", :red
+          say "Sorry. That email and password was invalid. Please try again", :red
           puts
         else
           token = response["token"]

data/lib/skylight/config.rb

@@ -7,6 +7,14 @@ module Skylight
     class Normalizer < Struct.new(:view_paths)
     end
 
+    # Stub out the GC Profiler in cases when it is not requested
+    GC_PROFILER_STUB = Struct.new(
+      :enable,
+      :disable,
+      :clear,
+      :total_time).
+      new(nil, nil, nil, 0)
+
     class << self
       def load_from_yaml(path, env=ENV)
         new do |config|
@@ -48,12 +56,14 @@ module Skylight
     end
 
     def initialize(attrs = {})
+      # Set defaults
       @ssl      = true
       @deflate  = true
       @host     = "agent.skylight.io"
       @port     = 443
       @interval = 5
       @protocol = JsonProto.new(self)
+      @enable_gc_profiler   = true
       @max_pending_traces   = 500
       @samples_per_interval = 100
 
@@ -68,48 +78,48 @@ module Skylight
         end
       end
 
-      @http ||= Util::HTTP.new(self)
-      @gc_profiler ||= GC::Profiler
-
       yield self if block_given?
-    end
 
-    attr_accessor :yaml_file
-    attr_accessor :authentication_token
-    attr_accessor :app_id
+      @http ||= Util::HTTP.new(self)
 
-    attr_accessor :ssl
-    alias_method :ssl?, :ssl
+      unless @gc_profiler
+        if enable_gc_profiler && GC::Profiler.respond_to?(:enable)
+          @gc_profiler = GC::Profiler
+        else
+          @gc_profiler = GC_PROFILER_STUB
+        end
+      end
+    end
 
-    attr_accessor :deflate
+    attr_accessor :yaml_file,
+      :authentication_token,
+      :app_id,
+      :ssl,
+      :deflate,
+      :host,
+      :port,
+      :http,
+      :samples_per_interval,
+      :interval,
+      :max_pending_traces,
+      :normalizer,
+      :protocol,
+      :logger,
+      :enable_gc_profiler,
+      :gc_profiler
+
+    alias_method :ssl?,     :ssl
     alias_method :deflate?, :deflate
 
-    attr_accessor :host
-
-    attr_accessor :port
-
-    attr_accessor :http
-
-    attr_accessor :samples_per_interval
-
-    attr_accessor :interval
-
-    attr_accessor :max_pending_traces
-
-    attr_reader :normalizer
-
-    attr_reader :protocol
-
     def protocol=(val)
       if val.is_a?(String) || val.is_a?(Symbol)
         class_name = val.to_s.capitalize+"Proto"
         val = Skylight.const_get(class_name).new(self)
       end
+
       @protocol = val
     end
 
-    attr_accessor :logger
-
     def log_level
       logger && logger.level
     end
@@ -123,13 +133,6 @@ module Skylight
       end
     end
 
-    attr_writer :gc_profiler
-
-    def gc_profiler
-      # TODO: Move this into tests
-      @gc_profiler ||= Struct.new(:enable, :disable, :clear, :total_time).new(nil, nil, nil, 0)
-    end
-
     def save(filename=yaml_file)
       FileUtils.mkdir_p File.dirname(filename)
 

data/lib/skylight/instrumenter.rb

@@ -58,7 +58,8 @@ module Skylight
 
       self
 
-    rescue
+    rescue Exception => e
+      error(e.message)
       nil
     end
 

data/lib/skylight/util/http.rb

@@ -16,9 +16,9 @@ module Skylight
         @config = config
       end
 
-      def auth(username, password)
+      def auth(email, password)
         req = Net::HTTP::Get.new("/login")
-        req.basic_auth username, password
+        req.basic_auth email, password
         response = make_request(req, nil, ACCEPT => APPLICATION_JSON)
         JSON.parse(response)
       end

data/lib/skylight/version.rb

@@ -1,3 +1,3 @@
 module Skylight
-  VERSION = '0.0.14'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: skylight
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors: