bixby-client 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 72daf8d74d021a0b3c397c5fa8ea3c01fe43e14d
-  data.tar.gz: a5cbd3599ca0c9e3f6dbec98cf8daf2f7f382f85
+  metadata.gz: 612e1c186d5b8d826adf4c9cb55bc4bc177f60ca
+  data.tar.gz: 2f4a93cdfd9cec51393e0cfae0971e14561aa549
 SHA512:
-  metadata.gz: ff267307702818c6a7b9f6969553d27b6b50e905eb8230ad5dd8c693ee90e6daaac975c71978fab0f9475430b4e9d320a32549bab74a53c895efc0ad5c679469
-  data.tar.gz: 09cff927b2e1e93dca72a0e3488873779c90fa192a5823a5023f512649fd09a07cb6630da52758b91be530aa73279cbc3c8ce68b3cfa894c9a5fabd672ecc06a
+  metadata.gz: 8cf630d2fe55a757490fe7800747ff521dae0359182f6ee6e055d2cc4c9c03aecdf9ae79923ccd6babfb17bc69359ab680bf280327de62327c8309be8505b319
+  data.tar.gz: 0b4d499a4ba0907471ba57b04a6eed2bd11124ce41d2df265447ec2c6747caaf8ee337e95733c870cf83a7e1b2e3fc0066d18bc29d7e280089e5c2e2fec202f9

data/.travis.yml

@@ -1,9 +1,12 @@
-language: ruby
+before_install:
+  - "curl -sL https://s3.bixby.io/wad > ~/wad"
+  - "chmod +x ~/wad"
+install:
+  - "~/wad"
 script: "bundle exec micron test/"
-after_script:
-  - "rake coverage"
-  - "rake coveralls"
+after_script: "rake coveralls"
 
+language: ruby
 rvm:
   - 2.0.0
   - 1.9.3
@@ -11,3 +14,9 @@ rvm:
 branches:
   only:
     - master
+
+env:
+  global:
+    - S3_REGION="us-east-1"
+    - S3_BUCKET_NAME="io.bixby.gemcache.wad.client"
+    - secure: d9Apjk8ofbfVRmfhFiifnMRQ8HRRX8rusJyqTjs8AbTYK0gHJmmSwGT/GSuBoP8a9IQ0vSjWVNgO9tY94syQnoBMXj+y4SxkunNWYxW8CTBOuOGJUup8tIy7JS0SenSY+kGFtKRH/vqbZs2AMd/iiybQ1osjHKvVEbNf9x9JdKY=

data/Gemfile

@@ -23,13 +23,6 @@ group :development do
   gem "debugger",     :platforms => [:mri_19, :mri_20]
   gem "debugger-pry", :require => "debugger/pry", :platforms => [:mri_19, :mri_20]
 
-  gem "simplecov",    :platforms => [:mri_19, :mri_20, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
-  gem "micron", :github => "chetan/micron"
-  gem "coveralls", :require => false
-
-  gem "webmock",      :require => false
-  gem "mocha",        :require => false
-
   gem "test_guard", :git => "https://github.com/chetan/test_guard.git"
   gem 'rb-inotify', :require => false
   gem 'rb-fsevent', :require => false
@@ -37,3 +30,11 @@ group :development do
 
 end
 
+group :test do
+  gem "simplecov",  :platforms => [:mri_19, :mri_20, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
+  gem "micron",     :github => "chetan/micron"
+  gem "coveralls",  :require => false
+
+  gem "webmock", :require => false
+  gem "mocha",   :require => false
+end

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git://github.com/chetan/micron.git
-  revision: 95399129ce8908484ed92a0de3a7e0ce83d99d2b
+  revision: 9bc1ad8ff5eed579c8f13a7615e8fbc78dbfebd4
   specs:
-    micron (0.1.0)
-      colorize
+    micron (0.5.0)
+      ansi
       easycov
       hitimes
 
 GIT
   remote: https://github.com/chetan/api_auth.git
-  revision: 86a79ca157402bd1c12d683a6b9948564b493443
+  revision: 2440c3a1d23b95977185ce25210c86cbeded7cee
   branch: bixby
   specs:
     api-auth (1.0.3)
@@ -40,7 +40,7 @@ GIT
 
 GIT
   remote: https://github.com/chetan/test_guard.git
-  revision: 6e184096f7713cefe6eab3d250b18d214e09a1ca
+  revision: a2a450c57a77f38d196f23206da03f491ddbca62
   specs:
     test_guard (0.2.1)
       awesome_print
@@ -54,8 +54,9 @@ GEM
   remote: https://rubygems.org/
   specs:
     addressable (2.3.5)
+    ansi (1.4.3)
     awesome_print (1.2.0)
-    bixby-common (0.4.6)
+    bixby-common (0.4.8)
       api-auth
       faye-websocket
       httpi
@@ -65,7 +66,7 @@ GEM
     builder (3.2.2)
     celluloid (0.15.2)
       timers (~> 1.1.0)
-    coderay (1.0.9)
+    coderay (1.1.0)
     colorize (0.6.0)
     columnize (0.3.6)
     coveralls (0.7.0)
@@ -86,7 +87,7 @@ GEM
       debugger (~> 1)
       pry (>= 0.9.9)
     debugger-ruby_core_source (1.2.3)
-    easycov (0.3.1)
+    easycov (0.4.0)
       multi_json
       simplecov
       simplecov-console
@@ -97,7 +98,7 @@ GEM
     faye-websocket (0.7.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.3.0)
-    ffi (1.9.0)
+    ffi (1.9.3)
     fuzzy_file_finder (1.0.4)
     git (1.2.6)
     github_api (0.10.1)
@@ -109,18 +110,18 @@ GEM
       oauth2
     growl (1.0.3)
     hashie (2.0.5)
-    highline (1.6.19)
+    highline (1.6.20)
     hirb (0.7.1)
     hitimes (1.2.1)
     httpauth (0.2.0)
     httpi (2.1.0)
       rack
       rubyntlm (~> 0.3.2)
-    json (1.8.0)
+    json (1.8.1)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    listen (2.0.0)
-      celluloid (>= 0.15.1)
+    listen (2.2.0)
+      celluloid (>= 0.15.2)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
     little-plugger (1.1.3)
@@ -129,11 +130,11 @@ GEM
       multi_json (>= 1.3.6)
     metaclass (0.0.1)
     method_source (0.8.2)
-    mime-types (1.25)
+    mime-types (2.0)
     mixlib-shellout (1.2.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.8.1)
+    multi_json (1.8.2)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
@@ -144,9 +145,9 @@ GEM
       multi_json (~> 1.0)
       multi_xml (~> 0.5)
       rack (~> 1.2)
-    oj (2.1.6)
-    pry (0.9.12.2)
-      coderay (~> 1.0.5)
+    oj (2.2.2)
+    pry (0.9.12.3)
+      coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
     rack (1.5.2)
@@ -169,17 +170,17 @@ GEM
       hirb
       simplecov
     simplecov-html (0.7.1)
-    slop (3.4.6)
+    slop (3.4.7)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
     thor (0.18.1)
     timers (1.1.0)
-    tins (0.11.0)
-    webmock (1.14.0)
+    tins (0.13.1)
+    webmock (1.16.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
     websocket-driver (0.3.0)
-    yard (0.8.7.2)
+    yard (0.8.7.3)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bixby-client.gemspec

@@ -2,15 +2,15 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: bixby-client 0.3.0 ruby lib
+# stub: bixby-client 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-client"
-  s.version = "0.3.0"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chetan Sarva"]
-  s.date = "2013-10-30"
+  s.date = "2013-11-19"
   s.description = "Bixby Client"
   s.email = "chetan@pixelcop.net"
   s.executables = ["bixby"]
@@ -47,6 +47,7 @@ Gem::Specification.new do |s|
     "lib/bixby-client/modules.rb",
     "lib/bixby-client/modules/inventory.rb",
     "lib/bixby-client/modules/metrics.rb",
+    "lib/bixby-client/modules/monitoring.rb",
     "lib/bixby-client/modules/repository.rb",
     "lib/bixby-client/patch/shellout.rb",
     "lib/bixby-client/platform_util.rb",
@@ -99,11 +100,6 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<debugger>, [">= 0"])
       s.add_development_dependency(%q<debugger-pry>, [">= 0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<micron>, [">= 0"])
-      s.add_development_dependency(%q<coveralls>, [">= 0"])
-      s.add_development_dependency(%q<webmock>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<test_guard>, [">= 0"])
       s.add_development_dependency(%q<rb-inotify>, [">= 0"])
       s.add_development_dependency(%q<rb-fsevent>, [">= 0"])
@@ -124,11 +120,6 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<debugger-pry>, [">= 0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<micron>, [">= 0"])
-      s.add_dependency(%q<coveralls>, [">= 0"])
-      s.add_dependency(%q<webmock>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<test_guard>, [">= 0"])
       s.add_dependency(%q<rb-inotify>, [">= 0"])
       s.add_dependency(%q<rb-fsevent>, [">= 0"])
@@ -150,11 +141,6 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<debugger-pry>, [">= 0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<micron>, [">= 0"])
-    s.add_dependency(%q<coveralls>, [">= 0"])
-    s.add_dependency(%q<webmock>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<test_guard>, [">= 0"])
     s.add_dependency(%q<rb-inotify>, [">= 0"])
     s.add_dependency(%q<rb-fsevent>, [">= 0"])

data/lib/bixby-client/app/commands/run.rb

@@ -34,8 +34,17 @@ module Bixby
 
         # Setup the ENV for exec
         def setup_env
+          # use the correct ruby bin
+          path = ENV["PATH"].dup
+          ruby_dir = RbConfig::CONFIG['bindir']
+          if !path.include? ruby_dir then
+            ENV["PATH"] = "#{ruby_dir}:#{path}"
+          end
+
           # stick ourselves in RUBYLIB to speedup exec time
           ENV["RUBYLIB"] = File.expand_path("../../../..", __FILE__)
+
+          # load helper script
           ENV["RUBYOPT"] = '-rbixby-client/script'
         end
 

data/lib/bixby-client/model/base.rb

@@ -5,10 +5,36 @@ module Bixby
 
       class << self
 
+
+        # Public API methods
+
+        def list(*args)
+          raise NotImplementedError
+        end
+
+        def find(id)
+          raise NotImplementedError
+        end
+
+        def update(id, data)
+          raise NotImplementedError
+        end
+
+        def destroy(id)
+          raise NotImplementedError
+        end
+
+
+
+        private
+
+        # Get the object at the given URL
+        #
+        # @param [String] url
+        #
+        # @return [Object] single object or an array of objects
         def get(url)
-          req = HTTPI::Request.new(api_uri(url))
-          req.headers["Content-Type"] = "application/json"
-          req.headers["Accept"] = "application/json" # temp workaround, manager should always return JSON on REST urls
+          req = create_req(url)
           Bixby.client.sign_http_request(req)
           res = HTTPI.get(req)
           if res.error? then
@@ -19,17 +45,68 @@ module Bixby
           if data.kind_of? Array then
             return data.map{ |d| self.new(d) }
           else
-            return self.new(d)
+            return self.new(data)
+          end
+        end
+
+        # Put some data at the given URL (update an object)
+        #
+        # @param [String] url
+        # @param [Hash] data          to update
+        #
+        # @return [Boolean]
+        def put(url, data)
+          req = create_req(url)
+          req.body = MultiJson.dump(data)
+          Bixby.client.sign_http_request(req)
+          res = HTTPI.put(req)
+          if res.error? then
+            raise "error" # TODO
+          end
+          true
+        end
+        alias_method :patch, :put
+
+        # Delete the resource at the given URL
+        #
+        # @param [String] url
+        #
+        # @return [Boolean]
+        def delete(url)
+          req = create_req(url)
+          Bixby.client.sign_http_request(req)
+          res = HTTPI.delete(req)
+          if res.error? then
+            raise "error" # TODO
           end
+          puts res.body
+          true
         end
 
+        # Create a fully qualified API URL
+        #
+        # @param [String] path        or a list of paths
+        #
+        # @return [String] API URL
         def api_uri(*args)
           if args.first !~ %r{^/rest/} then
-            args.unshift "/rest#{args.shift}"
+            args.unshift File.join("/rest", args.shift) # prepend /rest
           end
           URI.join(Bixby.client.manager_uri, *args).to_s
         end
 
+        # Create a REST request
+        #
+        # @param [String] url
+        #
+        # @return [HTTPI::Request]
+        def create_req(url)
+          req = HTTPI::Request.new(api_uri(url))
+          req.headers["Content-Type"] = "application/json"
+          req.headers["Accept"] = "application/json" # temp workaround, manager should always return JSON on REST urls
+          req
+        end
+
       end # self
 
       def initialize(hash=nil)
@@ -45,14 +122,13 @@ module Bixby
           EOF
           eval(code)
         end
+      end
 
-        def [](key)
-          if self.respond_to?(key.to_sym) then
-            return self.send(key.to_sym)
-          end
-          return nil
+      def [](key)
+        if self.respond_to?(key.to_sym) then
+          return self.send(key.to_sym)
         end
-
+        return nil
       end
 
     end

data/lib/bixby-client/model/check.rb

@@ -9,6 +9,15 @@ module Bixby
       end
 
       def self.find(id)
+        get("/checks/#{id}")
+      end
+
+      def self.update(id, data)
+        put("/checks/#{id}", data)
+      end
+
+      def self.destroy(id)
+        delete("/checks/#{id}")
       end
 
     end

data/lib/bixby-client/model/host.rb

@@ -9,6 +9,15 @@ module Bixby
       end
 
       def self.find(id)
+        get("/hosts/#{id}")
+      end
+
+      def self.update(id, data)
+        put("/hosts/#{id}", data)
+      end
+
+      def save
+        # TODO
       end
 
     end

data/lib/bixby-client/modules/monitoring.rb

@@ -0,0 +1,20 @@
+
+module Bixby
+  module Monitoring
+
+  # Update the check configuration for the specified Agent and restart the
+  # monitoring daemon.
+  #
+  # @param [Agent] agent
+  #
+  # @return [CommandResponse]
+    def self.update_check_config(agent)
+      if agent.kind_of? Bixby::Model::Agent then
+        agent = agent.id
+      end
+      req = JsonRequest.new("monitoring:update_check_config", [ agent ])
+      return Bixby.client.exec_api(req)
+    end
+
+  end # Monitoring
+end # Bixby

data/lib/bixby-client/modules/repository.rb

@@ -32,5 +32,56 @@ module Bixby
     end
 
 
+    # Download the given list of files
+    #
+    # @param [CommandSpec] cmd    CommandSpec representing the Bundle to which the files belong
+    # @param [Hash] files         Hash, returned from #list_files
+    #
+    # @deprecated Use {#list_files} and {#fetch_file} respectively
+    def self.download_files(cmd, files)
+      return if files.nil? or files.empty?
+
+      local_path = cmd.bundle_dir
+      digest = cmd.load_digest
+      files.each do |f|
+
+        fetch = true
+        if not digest then
+          fetch = true
+        elsif df = digest["files"].find{ |h| h["file"] == f["file"] } then
+          # compare digest w/ stored one if we have it
+          fetch = (df["digest"] != f["digest"])
+        else
+          fetch = true
+        end
+
+        if not fetch then
+          debug { "skipping: #{f}" }
+          next
+        end
+
+        debug { "fetching: #{f}"}
+
+        params = cmd.to_hash
+        params.delete(:digest)
+
+        filename = File.join(local_path, f['file'])
+        path = File.dirname(filename)
+        if not File.exist? path then
+          FileUtils.mkdir_p(path)
+        end
+
+        req = JsonRequest.new("provisioning:fetch_file", [ params, f['file'] ])
+        Bixby.client.exec_api_download(req, filename)
+        if f['file'] =~ /^bin/ then
+          # correct permissions for executables
+          FileUtils.chmod(0755, filename)
+        end
+      end # files.each
+
+      cmd.update_digest
+    end
+
+
   end
 end

data/lib/bixby-client/modules.rb

@@ -1,4 +1,5 @@
 
 require "bixby-client/modules/inventory"
 require "bixby-client/modules/metrics"
+require "bixby-client/modules/monitoring"
 require "bixby-client/modules/repository"

data/test/helper.rb

@@ -8,7 +8,6 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require "awesome_print"
 require "micron"
 require "micron/minitest"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-client
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bixby-common
@@ -220,76 +220,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  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: micron
-  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: coveralls
-  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
-    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: mocha
-  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: test_guard
   requirement: !ruby/object:Gem::Requirement
@@ -383,6 +313,7 @@ files:
 - lib/bixby-client/modules.rb
 - lib/bixby-client/modules/inventory.rb
 - lib/bixby-client/modules/metrics.rb
+- lib/bixby-client/modules/monitoring.rb
 - lib/bixby-client/modules/repository.rb
 - lib/bixby-client/patch/shellout.rb
 - lib/bixby-client/platform_util.rb