bixby-agent 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 275f6a697efb69ebdbcc9bf56a2d36f983926075
-  data.tar.gz: 0f3610364c9d921867c3bfed7af414fd5687f286
+  metadata.gz: 0269849a53e379766e5cbc9463c1e084af26739b
+  data.tar.gz: 67f156df0b65ccbe9e17f24d5b1c4a76719cb17f
 SHA512:
-  metadata.gz: c7b8615ad08f8defad163a7990ecd791e61d67b34bd11a3a6bbdb49cde50bfdb4e886faa341366b760a5de409afda48fa7fb1301fe03e01f7871380c87d56ba6
-  data.tar.gz: 6b85b85a8f310268e94a62e8f15f8d59433b3957c26481ebb5b843a13cdb1a16e1684b57548b0748533db1b4b521a30ac1cb3df25c61738a573c653ef16f63d3
+  metadata.gz: b2afe3e7f76744a99b76a87bc96e8f19c5db169ce5b7804b6bfc7128d1ac505eec25c8e2b51c7a55db2248acfb18a1a756c8eb76f7d3283b56cc8e3df953f778
+  data.tar.gz: aefb329dced8a26e2bb3e362badeb2c5128a037b53e778facd11e7ec39555e803d15e553d2d930c28fd219402e41cb733a7aaba435fee99dd025229d985140d1

data/.travis.yml

@@ -1,5 +1,6 @@
 language: ruby
 before_install:
+  - "gem install bundler --no-ri --no-rdoc"
   - "curl -sL https://s3.bixby.io/wad > ~/wad"
   - "chmod +x ~/wad"
 install:
@@ -11,8 +12,9 @@ after_script:
   - "bundle exec rake coveralls"
 
 rvm:
-  - 2.1.1
-  - 1.9.3
+  - 2.0.0-p598
+  - 2.1.5
+  - 2.2.0
 
 branches:
   only:
@@ -20,6 +22,7 @@ branches:
 
 env:
   global:
+    - MICRON_NO_HTML="1"
     - S3_REGION="us-east-1"
     - S3_BUCKET_NAME="io.bixby.gemcache.wad.agent"
     - secure: bnMJOHx5QrfTgOcxg0glw5x9mDoAJ0kKWILQaFCqwORwiJE4nh/3jYsx/uifVmSqOMXqY/9ozBwYrWeG6krPdcFCPS6mq4dVWsbtgQa31x9IWhjUg5lOt0MCrGXpq1JOD3CFIxnQ2f77hl0TzxutIfAtO023ad598+5/FVviyik=

data/Gemfile

@@ -4,7 +4,7 @@ group :self do
   gem 'bixby-agent', :path => "."
 end
 
-gem 'bixby-common', "~> 0.5"
+gem 'bixby-common', "~> 0.6"
 gem 'bixby-client', "~> 0.5"
 gem 'bixby-auth', "~> 0.1"
 #gem 'bixby-auth',   :path => "../auth"
@@ -16,11 +16,9 @@ gem 'daemons', "~> 1.1"
 gem 'multi_json', "~> 1.8"
 gem 'oj', "~> 2.11"
 gem 'httpi', "~> 2.3"
-gem 'curb', "~> 0.8"
 gem 'facter', '~> 2.0.0'
 gem 'mixlib-cli', "~> 1.5"
-gem 'mixlib-shellout', "~> 1.6"
-gem 'highline', "~> 1.6"
+gem 'mixlib-shellout', "~> 2.0"
 gem 'uuidtools', "~> 2.1"
 gem 'logging', "~> 1.8"
 
@@ -39,7 +37,7 @@ group :development do
   gem "test_guard", :github => "chetan/test_guard"
 
   # quality
-  gem "cane", :platforms => [:mri_19, :mri_20]
+  gem "cane", :platforms => [:mri_19, :mri_20, :mri_21, :mri_22]
 end
 
 group :development, :test do
@@ -52,7 +50,7 @@ group :development, :test do
   gem 'mocha',   :require => false
 
   # tools
-  gem "simplecov", :platforms => [:mri_19, :mri_20]
+  gem "simplecov", :platforms => [:mri_19, :mri_20, :mri_21, :mri_22]
   gem "coveralls", :require => false
   gem "micron", :github => "chetan/micron"
   gem 'rb-inotify', :require => false

data/Gemfile.lock

@@ -1,6 +1,6 @@
 GIT
   remote: git://github.com/chetan/jeweler.git
-  revision: b90381a3958daae7f3ce3d8c4d710fe39e72443b
+  revision: 0334ea443c612bcbe3ebb7594b0a391fab233667
   branch: bixby
   specs:
     jeweler (2.0.1)
@@ -14,7 +14,7 @@ GIT
 
 GIT
   remote: git://github.com/chetan/micron.git
-  revision: 0c1e9c0b9d9e052805f43485fe3454cbd25913c5
+  revision: 576f6699e2a7ff1828ce5c333cc5fa433c0be380
   specs:
     micron (0.5.1)
       ansi
@@ -36,19 +36,17 @@ GIT
 PATH
   remote: .
   specs:
-    bixby-agent (0.3.1)
+    bixby-agent (0.3.2)
       bixby-auth (~> 0.1)
       bixby-client (~> 0.5)
-      bixby-common (~> 0.5)
-      curb (~> 0.8)
+      bixby-common (~> 0.6)
       daemons (~> 1.1)
       facter (~> 2.0.0)
       god (~> 0.13)
-      highline (~> 1.6)
       httpi (~> 2.3)
       logging (~> 1.8)
       mixlib-cli (~> 1.5)
-      mixlib-shellout (~> 1.6)
+      mixlib-shellout (~> 2.0)
       multi_json (~> 1.8)
       oj (~> 2.11)
       uuidtools (~> 2.1)
@@ -57,11 +55,11 @@ GEM
   remote: https://rubygems.org/
   specs:
     CFPropertyList (2.2.8)
-    addressable (2.3.6)
-    ansi (1.4.3)
-    awesome_print (1.2.0)
-    bixby-auth (0.1.0)
-    bixby-client (0.5.1)
+    addressable (2.3.7)
+    ansi (1.5.0)
+    awesome_print (1.6.1)
+    bixby-auth (0.1.1)
+    bixby-client (0.5.2)
       bixby-common
       curb
       fuzzy_file_finder
@@ -69,7 +67,7 @@ GEM
       mixlib-shellout
       multi_json
       oj
-    bixby-common (0.5.0)
+    bixby-common (0.6.3)
       bixby-auth (~> 0.1)
       faye-websocket (~> 0.7)
       httpi (~> 2.1)
@@ -82,13 +80,13 @@ GEM
     celluloid (0.16.0)
       timers (~> 4.0.0)
     coderay (1.1.0)
-    colorize (0.7.3)
-    coveralls (0.7.2)
-      multi_json (~> 1.3)
-      rest-client (= 1.6.7)
-      simplecov (>= 0.7)
-      term-ansicolor (= 1.2.2)
-      thor (= 0.18.1)
+    colorize (0.7.5)
+    coveralls (0.7.11)
+      multi_json (~> 1.10)
+      rest-client (>= 1.6.8, < 2)
+      simplecov (~> 0.9.1)
+      term-ansicolor (~> 1.3)
+      thor (~> 0.19.1)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
     curb (0.8.6)
@@ -101,18 +99,18 @@ GEM
       simplecov
       simplecov-console
       simplecov-html
-    eventmachine (1.0.3)
+    eventmachine (1.0.7)
     facter (2.0.2)
       CFPropertyList (~> 2.2.6)
-    faraday (0.9.0)
+    faraday (0.9.1)
       multipart-post (>= 1.2, < 3)
-    faye-websocket (0.8.0)
+    faye-websocket (0.9.2)
       eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.4.0)
+      websocket-driver (>= 0.5.1)
     ffi (1.9.6)
     fuzzy_file_finder (1.0.4)
-    git (1.2.8)
-    github_api (0.12.2)
+    git (1.2.9.1)
+    github_api (0.12.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.4)
       faraday (~> 0.8, < 0.10)
@@ -120,16 +118,16 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.3)
       oauth2
-    god (0.13.4)
+    god (0.13.5)
     growl (1.0.3)
-    hashie (3.3.1)
-    highline (1.6.21)
-    hirb (0.7.2)
+    hashie (3.4.0)
+    highline (1.7.1)
+    hirb (0.7.3)
     hitimes (1.2.2)
     httpi (2.3.0)
       rack
-    jwt (1.0.0)
-    listen (2.8.0)
+    jwt (1.4.1)
+    listen (2.8.5)
       celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
@@ -140,15 +138,16 @@ GEM
     metaclass (0.0.4)
     method_source (0.8.2)
     mime-types (2.4.3)
-    mini_portile (0.6.1)
+    mini_portile (0.6.2)
     mixlib-cli (1.5.0)
-    mixlib-shellout (1.6.0)
+    mixlib-shellout (2.0.1)
     mocha (1.1.0)
       metaclass (~> 0.0.1)
-    multi_json (1.10.1)
+    multi_json (1.11.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.4.1)
+    netrc (0.10.3)
+    nokogiri (1.6.6.2)
       mini_portile (~> 0.6.0)
     oauth2 (1.0.0)
       faraday (>= 0.8, < 0.10)
@@ -156,45 +155,48 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    oj (2.11.1)
-    parallel (1.3.3)
+    oj (2.12.1)
+    parallel (1.4.0)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
-    rack (1.5.2)
-    rake (10.3.2)
+    rack (1.6.0)
+    rake (10.4.2)
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.4)
     rb-inotify (0.9.5)
       ffi (>= 0.5.0)
-    rest-client (1.6.7)
-      mime-types (>= 1.16)
+    rest-client (1.7.3)
+      mime-types (>= 1.16, < 3.0)
+      netrc (~> 0.7)
     safe_yaml (1.0.4)
-    semver2 (3.4.0)
-    simplecov (0.9.1)
+    semver2 (3.4.1)
+    simplecov (0.9.2)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
-      simplecov-html (~> 0.8.0)
+      simplecov-html (~> 0.9.0)
     simplecov-console (0.2.0)
       colorize
       hirb
       simplecov
-    simplecov-html (0.8.0)
+    simplecov-html (0.9.0)
     slop (3.6.0)
-    term-ansicolor (1.2.2)
-      tins (~> 0.8)
-    thor (0.18.1)
-    thread_safe (0.3.4)
+    term-ansicolor (1.3.0)
+      tins (~> 1.0)
+    thor (0.19.1)
+    thread_safe (0.3.5)
     timers (4.0.1)
       hitimes
-    tins (0.13.2)
+    tins (1.3.4)
     uuidtools (2.1.5)
     webmock (1.20.4)
       addressable (>= 2.3.6)
       crack (>= 0.3.2)
-    websocket-driver (0.4.0)
+    websocket-driver (0.5.3)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.2)
     yard (0.8.7.6)
 
 PLATFORMS
@@ -205,23 +207,21 @@ DEPENDENCIES
   bixby-agent!
   bixby-auth (~> 0.1)
   bixby-client (~> 0.5)
-  bixby-common (~> 0.5)
+  bixby-common (~> 0.6)
   cane
   colorize
   coveralls
-  curb (~> 0.8)
   daemons (~> 1.1)
   facter (~> 2.0.0)
   god (~> 0.13)
   growl
-  highline (~> 1.6)
   hirb
   httpi (~> 2.3)
   jeweler!
   logging (~> 1.8)
   micron!
   mixlib-cli (~> 1.5)
-  mixlib-shellout (~> 1.6)
+  mixlib-shellout (~> 2.0)
   mocha
   multi_json (~> 1.8)
   oj (~> 2.11)

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.2

data/bixby-agent.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-agent 0.3.1 ruby lib
+# stub: bixby-agent 0.3.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-agent"
-  s.version = "0.3.1"
+  s.version = "0.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Chetan Sarva"]
-  s.date = "2014-11-21"
+  s.date = "2015-03-19"
   s.description = "Bixby Agent"
   s.email = "chetan@pixelcop.net"
   s.executables = ["bixby-agent"]
@@ -72,14 +72,14 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/chetan/bixby-agent"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.2"
+  s.rubygems_version = "2.4.6"
   s.summary = "Bixby Agent"
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<bixby-common>, ["~> 0.5"])
+      s.add_runtime_dependency(%q<bixby-common>, ["~> 0.6"])
       s.add_runtime_dependency(%q<bixby-client>, ["~> 0.5"])
       s.add_runtime_dependency(%q<bixby-auth>, ["~> 0.1"])
       s.add_runtime_dependency(%q<god>, ["~> 0.13"])
@@ -87,11 +87,9 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<multi_json>, ["~> 1.8"])
       s.add_runtime_dependency(%q<oj>, ["~> 2.11"])
       s.add_runtime_dependency(%q<httpi>, ["~> 2.3"])
-      s.add_runtime_dependency(%q<curb>, ["~> 0.8"])
       s.add_runtime_dependency(%q<facter>, ["~> 2.0.0"])
       s.add_runtime_dependency(%q<mixlib-cli>, ["~> 1.5"])
-      s.add_runtime_dependency(%q<mixlib-shellout>, ["~> 1.6"])
-      s.add_runtime_dependency(%q<highline>, ["~> 1.6"])
+      s.add_runtime_dependency(%q<mixlib-shellout>, ["~> 2.0"])
       s.add_runtime_dependency(%q<uuidtools>, ["~> 2.1"])
       s.add_runtime_dependency(%q<logging>, ["~> 1.8"])
       s.add_development_dependency(%q<yard>, ["~> 0.7"])
@@ -113,7 +111,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
       s.add_development_dependency(%q<rb-fchange>, [">= 0"])
     else
-      s.add_dependency(%q<bixby-common>, ["~> 0.5"])
+      s.add_dependency(%q<bixby-common>, ["~> 0.6"])
       s.add_dependency(%q<bixby-client>, ["~> 0.5"])
       s.add_dependency(%q<bixby-auth>, ["~> 0.1"])
       s.add_dependency(%q<god>, ["~> 0.13"])
@@ -121,11 +119,9 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<multi_json>, ["~> 1.8"])
       s.add_dependency(%q<oj>, ["~> 2.11"])
       s.add_dependency(%q<httpi>, ["~> 2.3"])
-      s.add_dependency(%q<curb>, ["~> 0.8"])
       s.add_dependency(%q<facter>, ["~> 2.0.0"])
       s.add_dependency(%q<mixlib-cli>, ["~> 1.5"])
-      s.add_dependency(%q<mixlib-shellout>, ["~> 1.6"])
-      s.add_dependency(%q<highline>, ["~> 1.6"])
+      s.add_dependency(%q<mixlib-shellout>, ["~> 2.0"])
       s.add_dependency(%q<uuidtools>, ["~> 2.1"])
       s.add_dependency(%q<logging>, ["~> 1.8"])
       s.add_dependency(%q<yard>, ["~> 0.7"])
@@ -148,7 +144,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<rb-fchange>, [">= 0"])
     end
   else
-    s.add_dependency(%q<bixby-common>, ["~> 0.5"])
+    s.add_dependency(%q<bixby-common>, ["~> 0.6"])
     s.add_dependency(%q<bixby-client>, ["~> 0.5"])
     s.add_dependency(%q<bixby-auth>, ["~> 0.1"])
     s.add_dependency(%q<god>, ["~> 0.13"])
@@ -156,11 +152,9 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<multi_json>, ["~> 1.8"])
     s.add_dependency(%q<oj>, ["~> 2.11"])
     s.add_dependency(%q<httpi>, ["~> 2.3"])
-    s.add_dependency(%q<curb>, ["~> 0.8"])
     s.add_dependency(%q<facter>, ["~> 2.0.0"])
     s.add_dependency(%q<mixlib-cli>, ["~> 1.5"])
-    s.add_dependency(%q<mixlib-shellout>, ["~> 1.6"])
-    s.add_dependency(%q<highline>, ["~> 1.6"])
+    s.add_dependency(%q<mixlib-shellout>, ["~> 2.0"])
     s.add_dependency(%q<uuidtools>, ["~> 2.1"])
     s.add_dependency(%q<logging>, ["~> 1.8"])
     s.add_dependency(%q<yard>, ["~> 0.7"])

data/lib/bixby-agent/agent.rb

@@ -43,7 +43,6 @@ class Agent
   end
 
   def initialize()
-    #uri, tenant = nil, password = nil, root_dir = nil
     Bixby::Log.setup_logger()
     @new = true
 

data/lib/bixby-agent/agent/handshake.rb

@@ -14,19 +14,17 @@ module Handshake
   # Register the agent with the server
   #
   # @param [String] url                 Bixby manager URL
-  # @param [String] tenant              Tenant name
-  # @param [String] password            Tenant registration password
+  # @param [String] token               Client registration token
   # @param [String] tags                Comma-separated list of tags (e.g., "foo,bar")
   #
   # @return [JsonResponse] response from server
-  def register_agent(url, tenant, password, tags=nil)
+  def register_agent(url, token, tags=nil)
     Bixby.manager_uri = @manager_uri = url
     ret = Bixby::Inventory.register_agent({
       :uuid       => @uuid,
       :public_key => self.public_key.to_s,
       :hostname   => get_hostname(),
-      :tenant     => tenant,
-      :password   => password,
+      :token      => token,
       :tags       => tags,
       :version    => Bixby::Agent::VERSION
       })

data/lib/bixby-agent/agent/shell_exec.rb

@@ -38,10 +38,12 @@ module ShellExec
       old_env[r] = ENV.delete(r) if ENV.include?(r) }
 
     logger.debug("exec: #{cmd}")
+    uid = lookup_id(:uid, spec.user)
+    gid = lookup_id(:gid, spec.group)
     shell = Mixlib::ShellOut.new(cmd, :input => spec.stdin,
-                                      :env   => spec.env,
-                                      :user  => uid(spec.user),
-                                      :group => gid(spec.group))
+                                      :env   => reset_env(spec.env, uid),
+                                      :user  => uid,
+                                      :group => gid)
 
     shell.run_command
 
@@ -55,51 +57,44 @@ module ShellExec
 
   private
 
-  # Return uid of 'bixby' user, if it exists
-  #
-  # @param [String] user        username to run as [Optional, default=bixby]
-  # @return [Fixnum]
-  def uid(user)
-    if Process.uid != 0 then
-      logger.warn("Can't change effective uid unless running as root")
-      return nil
+  # Merge in the correct ENV settings for the target user
+  def reset_env(env, uid)
+    if uid.nil? || uid == Process.uid then
+      # no need to change
+      return env
     end
 
-    if user then
-      begin
-        return Etc.getpwnam(user).uid
-      rescue ArgumentError => ex
-        logger.warn("Username '#{user}' was invalid: #{ex.message}")
-      end
-    end
-
-    begin
-      return Etc.getpwnam("bixby").uid
-    rescue ArgumentError
-    end
-    return nil
+    env ||= {}
+    user = Etc.getpwuid(uid)
+    env.merge({"HOME" => user.dir, "USER" => user.name})
   end
 
-  # Return uid of 'bixby' group, if it exists
+  # Lookup the id of the given user or group
+  #
+  # @param [Symbol] type          :uid or :gid
+  # @param [String] str           user or group name [Optional, default=bixby]
   #
-  # @param [String] group         group to run as [Optional, default=bixby]
   # @return [Fixnum]
-  def gid(group)
+  def lookup_id(type, str=nil)
     if Process.uid != 0 then
       logger.warn("Can't change effective gid unless running as root")
       return nil
     end
 
-    if group then
+    method = type == :uid ? :getpwnam : :getgrnam
+
+    if !(str.nil? or str.empty?) then
       begin
-        return Etc.getgrnam(group).gid
+        logger.debug "Running as #{type} '#{str}'"
+        return Etc.send(method, str).send(type)
       rescue ArgumentError => ex
-        logger.warn("Group '#{group}' was invalid: #{ex.message}")
+        logger.warn("#{type} lookup for '#{str}' failed: #{ex.message}")
       end
     end
 
     begin
-      return Etc.getgrnam("bixby").gid
+      logger.debug "Running as #{type} 'bixby' (default)"
+      return Etc.send(method, "bixby").send(type)
     rescue ArgumentError
     end
     return nil

data/lib/bixby-agent/agent_handler.rb

@@ -4,7 +4,6 @@ module Bixby
   class AgentHandler < Bixby::RpcHandler
 
     include Bixby::Log
-    # include Bixby::CryptoUti
 
     def initialize(request)
       @request = request

data/lib/bixby-agent/app.rb

@@ -5,7 +5,6 @@ require 'bixby-agent/app/cli'
 require 'bixby-agent/help/system_time'
 
 require 'daemons'
-require 'highline/import'
 
 module Bixby
 class App
@@ -62,12 +61,9 @@ class App
         raise ConfigException, "Bad manager URI: '#{uri}'"
       end
 
-      tenant   = @config[:tenant]   || HighLine.new.ask("Tenant: ")
-      password = @config[:password] || HighLine.new.ask("Enter agent registration password: ") { |q| q.echo = "*" }
-
       # register
       $stdout.puts "Going to register with manager: #{uri}"
-      if (ret = agent.register_agent(uri, tenant, password, @config[:tags])).fail? then
+      if (ret = agent.register_agent(uri, @config[:token], @config[:tags])).fail? then
         $stderr.puts "error: failed to register with manager!"
         $stderr.puts "reason:"
         if ret.message =~ /900 seconds old/ then
@@ -125,21 +121,26 @@ class App
   def start_websocket_client
     # make sure log level is still set correctly here
     Bixby::Log.setup_logger(:level => Logging.appenders["file"].level)
-    logger.info "Started Bixby Agent"
+    logger.info "Started Bixby Agent #{Bixby::Agent::VERSION}"
     @client = Bixby::WebSocket::Client.new(Bixby.agent.manager_ws_uri, AgentHandler)
     trap_signals()
     @client.start
   end
 
   def trap_signals
-    %w{INT QUIT TERM}.each do |sig|
-      Kernel.trap(sig) do
-        @client.stop()
+
+    Bixby::Signal.trap(%w{INT QUIT TERM}) do |sig|
+      @client.stop()
+      if sig == "INT" then
         puts # to get a blank line after the ^C in the term
-        reason = sig + (sig == "INT" ? " (^C)" : "")
-        logger.warn  "caught #{reason} signal; exiting"
+        reason = " (^C)"
+      else
+        reason = ""
       end
+      logger.warn  "caught #{sig}#{reason} signal; exiting"
     end
+
+    Bixby::ThreadDump.trap!
   end
 
   # If running as root, fix ownership of var and etc dirs
@@ -192,8 +193,7 @@ class App
   end
 
   # Copied from daemons gem. We hit a bug where closing FDs failed,
-  # probably related to prompting for a password. So close them
-  # all cleanly before daemonizing.
+  # so close them all cleanly before daemonizing.
   def close_fds
     # don't close stdin/out/err (0/1/2)
     3.upto(8192).each do |i|

data/lib/bixby-agent/app/cli.rb

@@ -1,6 +1,5 @@
 
 require 'mixlib/cli'
-require 'highline/import'
 
 module Bixby
 class App
@@ -30,7 +29,7 @@ Where <command> is one of:
 
 To register with the manager:
 
-  #{$0} --register [URL] -t TENANT -P [PASSWORD] [--tags TAG1,TAG2]
+  #{$0} --register [URL] --token TOKEN [--tags TAG1,TAG2]
 
 Options:
 
@@ -44,24 +43,11 @@ EOF
       :description    => "Register with the management server (optional URL, default: https://bixby.io)",
       :proc           => Proc.new { |url| url || "https://bixby.io" } # default URL
 
-  option :tenant,
+  option :token,
       :on             => :head,
-      :short          => "-t TENANT",
-      :long           => "--tenant TENANT",
-      :description    => "Tenant name"
-
-  option :password,
-      :on             => :head,
-      :short          => "-P [PASSWORD]",
-      :long           => "--password [PASSWORD]",
-      :description    => "Agent registration password (prompt if not supplied)",
-      :proc           => Proc.new { |c|
-                           if c then
-                             c
-                           else
-                             HighLine.new.ask("Enter agent registration password: ") { |q| q.echo = "*" }
-                           end
-                         }
+      :short          => "-t TOKEN",
+      :long           => "--token TOKEN",
+      :description    => "Client registration token"
 
   option :tags,
       :on             => :head,

data/lib/bixby-agent/version.rb

@@ -2,7 +2,7 @@
 module Bixby
   class Agent
 
-    VERSION = File.new(File.expand_path(File.join(File.dirname(__FILE__), "../../VERSION"))).read.strip
+    VERSION = File.new(File.expand_path("../../../VERSION", __FILE__)).read.strip
 
   end
 end

data/lib/bixby-agent/websocket/client.rb

@@ -20,6 +20,7 @@ module Bixby
         @handler = handler
         @tries = 0
         @exiting = false
+        @thread_pool = Bixby::ThreadPool.new(:min_size => 1, :max_size => 4)
       end
 
       # Start the Client thread
@@ -53,11 +54,19 @@ module Bixby
       # the connection open forever, reconnecting as needed.
       def connect
 
+        # cleanup any previously opened connections
+        if !@ws.nil? && ws.ready_state != Faye::WebSocket::API::CLOSED then
+          begin
+            @ws.close
+          rescue Exception => ex
+          end
+        end
+
         # Ping is set to 55 sec to workaround issues with certain gateway devices which have a hard
         # 60 sec timeout, like the AWS ELB:
         # http://docs.aws.amazon.com/ElasticLoadBalancing/latest/DeveloperGuide/ts-elb-healthcheck.html
         @ws = Faye::WebSocket::Client.new(@url, nil, :ping => 55)
-        @api = Bixby::WebSocket::APIChannel.new(@ws, @handler)
+        @api = Bixby::WebSocket::APIChannel.new(@ws, @handler, @thread_pool)
 
         ws.on :open do |e|
           begin
@@ -82,7 +91,7 @@ module Bixby
             api.close(e)
             return if @exiting or not EM.reactor_running?
             if was_connected then
-              logger.info "lost connection to manager"
+              logger.info "lost connection to manager (code=#{e.code}; reason=\"#{e.reason}\")"
             else
               logger.debug "failed to connect"
             end
@@ -120,6 +129,9 @@ module Bixby
         end
 
         # Start a thread to watch for auth timeout
+        #
+        # Because the CONNECT request is fully-async, we need to make sure a reply is received
+        # within a certain time limit. If not, reconnect
         Thread.new do
           begin
             sec = 60
@@ -155,13 +167,13 @@ module Bixby
 
         if @exiting or not EM.reactor_running? then
           # shutting down, don't try to reconnect
-          logger.debug "not retrying since we are shutting down"
+          logger.info "not reconnecting since we are shutting down"
           return false
         end
 
         @tries += 1
         if @tries == 1 then
-          logger.debug "retrying immediately"
+          logger.info "retrying immediately"
 
         # :nocov:
         elsif @tries == 2 then

data/test/base.rb

@@ -18,8 +18,7 @@ module Bixby
         @support_path = File.join(@git_path, "test", "support")
 
         @manager_uri = "http://localhost:3000"
-        @tenant = "pixelcop"
-        @password = "foobar"
+        @token = "ABCDEF012345"
         @root_dir = Dir.mktmpdir("bixby-agent-test-")
         @port = 9999
 

data/test/helper.rb

@@ -10,8 +10,6 @@ end
 
 require 'micron/minitest'
 
-# load curb first so webmock can stub it out as necessary
-require 'curb'
 require 'webmock'
 include WebMock::API
 require 'mocha/setup'

data/test/stub_eventmachine.rb

@@ -8,6 +8,7 @@ module EventMachine
     alias_method :_orig_stop_event_loop, :stop_event_loop
 
     def run_immediately(&block)
+      @reactor_pid = Process.pid
       @reactor_running = true
       block.call() if block
     end

data/test/test_agent.rb

@@ -74,11 +74,11 @@ class TestAgent < TestCase
 
     # stub out http request
     stub_request(:post, "#{@manager_uri}/api").with { |req|
-      req.body =~ /inventory:register_agent/ and req.body =~ /"tenant":"pixelcop"/
+      req.body =~ /inventory:register_agent/ and req.body =~ /"token":"#{@token}"/
 
     }.to_return(:body => response_str, :status => 200)
 
-    response = @agent.register_agent(@manager_uri, @tenant, @password)
+    response = @agent.register_agent(@manager_uri, @token)
     assert response.status == "success"
 
     key_file = Bixby.path("etc", "server.pub")

data/test/test_app.rb

@@ -15,8 +15,7 @@ class TestApp < TestCase
     ARGV.clear
     ARGV << "--register" << @manager_uri
     ARGV << "-d" << @root_dir
-    ARGV << "--tenant" << "mytenant"
-    ARGV << "--password" << "mypass"
+    ARGV << "--token" << "mytoken"
 
     response_str = MultiJson.dump({
                       :data => {:server_key => "-----BEGIN RSA PUBLIC KEY-----",
@@ -63,8 +62,7 @@ class TestApp < TestCase
     ARGV << "--register" # uri should default to bixby.io
     ARGV << "--debug"
     ARGV << "--directory" << @root_dir
-    ARGV << "--tenant" << "mytenant"
-    ARGV << "--password" << "mypass"
+    ARGV << "--token" << "mytoken"
 
     Bixby::WebSocket::Client.any_instance.expects(:start).once()
 
@@ -116,8 +114,7 @@ class TestApp < TestCase
     ARGV << "--register" # uri should default to bixby.io
     ARGV << "--debug"
     ARGV << "--directory" << @root_dir
-    ARGV << "--tenant" << "mytenant"
-    ARGV << "--password" << "mypass"
+    ARGV << "--token" << "mytoken"
 
     stub_request(:get, "http://google.com/").to_return(:status => 200, :body => "", :headers => {"Date" => (Time.new+1).utc.to_s})
 

data/test/websocket/test_client.rb

@@ -19,7 +19,10 @@ module WebSocket
 class TestClient < TestCase
 
   class FakeClient
-    attr_reader :types
+    class Event
+      attr_reader :code, :reason
+    end
+    attr_reader :types, :ready_state
     def initialize
       @types = {}
     end
@@ -27,6 +30,7 @@ class TestClient < TestCase
       @types[type] = block
     end
     def trigger(type, event)
+      event ||= Event.new
       @types[type].call(event)
     end
     def close

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-agent
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-21 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bixby-common
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.5'
+        version: '0.6'
 - !ruby/object:Gem::Dependency
   name: bixby-client
   requirement: !ruby/object:Gem::Requirement
@@ -122,20 +122,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
-- !ruby/object:Gem::Dependency
-  name: curb
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: facter
   requirement: !ruby/object:Gem::Requirement
@@ -170,28 +156,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: highline
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement
@@ -550,7 +522,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Bixby Agent