bixby-client 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c5e642d613d7e0e206da3e078ee17f54d5e1f4d
-  data.tar.gz: d9640168edf4f63989d498d9a442840a4c20de60
+  metadata.gz: 342a2bdbd9cca476b783cf533eb5c6f3a3d8e73a
+  data.tar.gz: d1e26d76f70f67c03843db52df19a4857f5ea6db
 SHA512:
-  metadata.gz: 48370186e4329161f1949b49586f4e6e90f7fe5cba3ef5697a9b831835656850d4ffb3a5c222c6ec352ae1c8b4ea41836375c4ee5bf9f94f78b09f204e6282d8
-  data.tar.gz: f8ac2fff1b61d1b3ee551e0f87a4cc8a940110f75fa1c360ed08beaae9428a51b0e3c67080b33bda205ec7e470eae22a8b522343c07e3643a804307b1f220f64
+  metadata.gz: f9b071a63eda0e7dfcbc7ec14adea9e0b281d9ab02d5b025c7ad6f186f2cbd464f6af87fa92a0253c67f831837b420f0b880f0a5824e0ec09a8a1f43aa63491d
+  data.tar.gz: d3740d5b4bec3ac8cb91d9ec42df549c4a59cca201fd424f9ea5130798f9db3b258aa72421f5a6254e73f628d0ca985b975767a18c6a2fb842c32f49e0a91cb4

data/Gemfile

@@ -19,12 +19,12 @@ group :development do
   gem "bundler"
   gem "jeweler", :git => "https://github.com/chetan/jeweler.git", :branch => "bixby"
   gem "pry"
-  gem "debugger",     :platforms => :mri_19
-  gem "debugger-pry", :require => "debugger/pry", :platforms => :mri_19
+  gem "debugger",     :platforms => [:mri_19, :mri_20]
+  gem "debugger-pry", :require => "debugger/pry", :platforms => [:mri_19, :mri_20]
 
-  gem "simplecov",    :platforms => [:mri_19, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
+  gem "simplecov",    :platforms => [:mri_19, :mri_20, :rbx], :git => "https://github.com/chetan/simplecov.git", :branch => "inline_nocov"
+  gem "micron", :github => "chetan/micron"
 
-  gem "minitest",     "~> 4.7", :platforms => [:mri_19, :rbx]
   gem "webmock",      :require => false
   gem "mocha",        :require => false
 

data/Gemfile.lock

@@ -1,6 +1,15 @@
+GIT
+  remote: git://github.com/chetan/micron.git
+  revision: e1a12a19e9d1f3f0e27bcec4cad4007e2a1c3d1a
+  specs:
+    micron (0.1.0)
+      colorize
+      easycov
+      hitimes
+
 GIT
   remote: https://github.com/chetan/api_auth.git
-  revision: eea13ad54cca87de133c80be6aff96cb21a21601
+  revision: 86a79ca157402bd1c12d683a6b9948564b493443
   branch: bixby
   specs:
     api-auth (1.0.3)
@@ -31,12 +40,10 @@ GIT
 
 GIT
   remote: https://github.com/chetan/test_guard.git
-  revision: 7d069b2d7e46fcbecd7a52966fda7d2d1945e2c9
+  revision: 72fade8f2fda1747ece442aee40be53d5cb293c9
   specs:
     test_guard (0.2.1)
       awesome_print
-      debugger
-      debugger-pry
       growl
       listen
       simplecov
@@ -49,8 +56,8 @@ GEM
   specs:
     addressable (2.3.5)
     ansi (1.4.3)
-    awesome_print (1.1.0)
-    bixby-common (0.4.1)
+    awesome_print (1.2.0)
+    bixby-common (0.4.5)
       api-auth
       faye-websocket
       httpi
@@ -58,7 +65,7 @@ GEM
       multi_json
     builder (3.2.2)
     coderay (1.0.9)
-    colorize (0.5.8)
+    colorize (0.6.0)
     columnize (0.3.6)
     crack (0.4.1)
       safe_yaml (~> 0.9.0)
@@ -72,12 +79,15 @@ GEM
       debugger (~> 1)
       pry (>= 0.9.9)
     debugger-ruby_core_source (1.2.3)
+    easycov (0.1.1)
+      multi_json
+      simplecov
     eventmachine (1.0.3)
     faraday (0.8.8)
       multipart-post (~> 1.2.0)
-    faye-websocket (0.6.3)
+    faye-websocket (0.7.0)
       eventmachine (>= 0.12.0)
-      websocket-driver (>= 0.2.0)
+      websocket-driver (>= 0.3.0)
     ffi (1.9.0)
     git (1.2.6)
     github_api (0.10.1)
@@ -91,6 +101,7 @@ GEM
     hashie (2.0.5)
     highline (1.6.19)
     hirb (0.7.1)
+    hitimes (1.2.1)
     httpauth (0.2.0)
     httpi (2.1.0)
       rack
@@ -98,7 +109,7 @@ GEM
     json (1.8.0)
     jwt (0.1.8)
       multi_json (>= 1.5)
-    listen (1.3.0)
+    listen (1.3.1)
       rb-fsevent (>= 0.9.3)
       rb-inotify (>= 0.9)
       rb-kqueue (>= 0.2)
@@ -108,11 +119,10 @@ GEM
       multi_json (>= 1.3.6)
     metaclass (0.0.1)
     method_source (0.8.2)
-    minitest (4.7.5)
     mixlib-shellout (1.2.0)
     mocha (0.14.0)
       metaclass (~> 0.0.1)
-    multi_json (1.7.9)
+    multi_json (1.8.0)
     multi_xml (0.5.5)
     multipart-post (1.2.0)
     nokogiri (1.5.10)
@@ -133,7 +143,7 @@ GEM
     rb-fchange (0.0.6)
       ffi
     rb-fsevent (0.9.3)
-    rb-inotify (0.9.1)
+    rb-inotify (0.9.2)
       ffi (>= 0.5.0)
     rb-kqueue (0.2.0)
       ffi (>= 0.5.0)
@@ -155,7 +165,7 @@ GEM
     webmock (1.13.0)
       addressable (>= 2.2.7)
       crack (>= 0.3.2)
-    websocket-driver (0.2.3)
+    websocket-driver (0.3.0)
     yard (0.8.7)
 
 PLATFORMS
@@ -170,7 +180,7 @@ DEPENDENCIES
   debugger-pry
   httpi
   jeweler!
-  minitest (~> 4.7)
+  micron!
   mixlib-shellout
   mocha
   multi_json

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.2.2

data/bixby-client.gemspec

@@ -2,14 +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.2.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "bixby-client"
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Chetan Sarva"]
-  s.date = "2013-08-29"
+  s.date = "2013-09-26"
   s.description = "Bixby Client"
   s.email = "chetan@pixelcop.net"
   s.executables = ["bixby"]
@@ -45,16 +46,23 @@ Gem::Specification.new do |s|
     "test/bixby-client/test_command.rb",
     "test/bixby-client/test_platform_util.rb",
     "test/helper.rb",
+    "test/patch/test_shellout.rb",
     "test/support/root_dir/etc/bixby.yml",
     "test/support/root_dir/etc/id_rsa",
     "test/support/root_dir/etc/server",
     "test/support/root_dir/etc/server.pub",
-    "test/test_bixby-client.rb"
+    "test/support/root_dir/repo/vendor/test_bundle/bin/cat",
+    "test/support/root_dir/repo/vendor/test_bundle/bin/echo",
+    "test/support/root_dir/repo/vendor/test_bundle/digest",
+    "test/support/root_dir/repo/vendor/test_bundle/lib/test_bundle.rb",
+    "test/support/root_dir/repo/vendor/test_bundle/manifest.json",
+    "test/test_bixby-client.rb",
+    "test/test_script_util.rb"
   ]
   s.homepage = "http://github.com/chetan/bixby-client"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.3"
+  s.rubygems_version = "2.1.0"
   s.summary = "Bixby Client"
 
   if s.respond_to? :specification_version then
@@ -76,7 +84,7 @@ Gem::Specification.new do |s|
       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<minitest>, ["~> 4.7"])
+      s.add_development_dependency(%q<micron>, [">= 0"])
       s.add_development_dependency(%q<webmock>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_development_dependency(%q<test_guard>, [">= 0"])
@@ -99,7 +107,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<debugger>, [">= 0"])
       s.add_dependency(%q<debugger-pry>, [">= 0"])
       s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<minitest>, ["~> 4.7"])
+      s.add_dependency(%q<micron>, [">= 0"])
       s.add_dependency(%q<webmock>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<test_guard>, [">= 0"])
@@ -123,7 +131,7 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<debugger>, [">= 0"])
     s.add_dependency(%q<debugger-pry>, [">= 0"])
     s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<minitest>, ["~> 4.7"])
+    s.add_dependency(%q<micron>, [">= 0"])
     s.add_dependency(%q<webmock>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<test_guard>, [">= 0"])

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

@@ -20,52 +20,15 @@ module Bixby
       return res.data
     end
 
-    # Download the given list of files
+    # Download the given command file
     #
     # @param [CommandSpec] cmd    CommandSpec representing the Bundle to which the files belong
     # @param [Hash] files         Hash, returned from #list_files
-    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
+    def self.fetch_file(cmd, file, dest)
+      params = cmd.to_hash
+      params.delete(:digest)
+      req = JsonRequest.new("provisioning:fetch_file", [params, file])
+      Bixby.client.exec_api_download(req, dest)
     end
 
 

data/lib/bixby-client/script_util.rb

@@ -21,7 +21,8 @@ module Bixby
           end
         end
       end
-    end
+
+    end # UseBundle
 
     include UseBundle
 

data/tasks/test.rake

@@ -1,15 +1,5 @@
 
-require 'rake/testtask'
-Rake::TestTask.new(:test) do |test|
-  test.libs << 'lib' << 'test'
-  test.pattern = 'test/**/test_*.rb'
+require "micron/rake"
+Micron::Rake.new do |task|
 end
-
 task :default => :test
-
-begin
-  require 'single_test/tasks'
-
-rescue LoadError
-  warn "single_test not available"
-end

data/test/base.rb

@@ -1,14 +1,23 @@
 
 module Bixby
-  class TestCase < MiniTest::Unit::TestCase
+  class TestCase < Micron::TestCase
 
     def setup
       super
-      ENV["BIXBY_HOME"] = File.expand_path(File.join(File.dirname(__FILE__), "support", "root_dir"))
+      setup_agent_dir()
     end
 
     def teardown
       super
+      `rm -rf /tmp/bixby_client_test_agent`
+      ENV["BIXBY_HOME"] = nil
+    end
+
+    def setup_agent_dir
+      template = File.expand_path(File.join(File.dirname(__FILE__), "support", "root_dir"))
+      ENV["BIXBY_HOME"] = "/tmp/bixby_client_test_agent"
+      FileUtils.mkdir_p(Bixby.root)
+      `cp -a #{template}/* #{Bixby.root}/`
     end
 
   end

data/test/helper.rb

@@ -8,8 +8,9 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 
-require 'test_guard'
-TestGuard.load_simplecov()
+require "awesome_print"
+require "micron"
+require "micron/minitest"
 
 # Load any HTTP clients before webmock so they can be stubbed
 # require 'curb'
@@ -24,4 +25,7 @@ ENV["RUBYLIB"] = $:.first
 require "bixby-client"
 require "base"
 
-MiniTest::Unit.autorun
+EasyCov.path = "coverage"
+EasyCov.filters << EasyCov::IGNORE_GEMS << EasyCov::IGNORE_STDLIB << EasyCov::IGNORE_TESTS
+
+EasyCov.start

data/test/patch/test_shellout.rb

@@ -0,0 +1,21 @@
+
+require 'helper'
+
+module Bixby
+module Test
+module Patch
+
+class TestShellout < TestCase
+
+  def test_patches
+    cmd = Mixlib::ShellOut.new("dir")
+    cmd.run_command
+    assert cmd.success?
+    refute cmd.fail?
+  end
+
+end
+
+end # Pach
+end # Test
+end # Bixby

data/test/support/root_dir/repo/vendor/test_bundle/bin/cat

@@ -0,0 +1,2 @@
+#!/bin/bash
+cat -

data/test/support/root_dir/repo/vendor/test_bundle/bin/echo

@@ -0,0 +1,2 @@
+#!/bin/sh
+echo $*

data/test/support/root_dir/repo/vendor/test_bundle/digest

@@ -0,0 +1,17 @@
+{
+  "digest": "c1af0e59a74367e83492a7501f6bdd7ed33de005c3f727a302c5ddfafa8c6f70",
+  "files": [
+    {
+      "file": "bin/cat",
+      "digest": "6d14ab63802f3ef51bdc16db1cfeb6df93167fe7a2aa09a6c737293d42c118b2"
+    },
+    {
+      "file": "bin/echo",
+      "digest": "5ca36fa0f9bd59e8169cc379215e6a481363df5b1e745f0442170fe6a56e1118"
+    },
+    {
+      "file": "manifest.json",
+      "digest": "e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855"
+    }
+  ]
+}

data/test/support/root_dir/repo/vendor/test_bundle/lib/test_bundle.rb

@@ -0,0 +1,3 @@
+
+class TestBundle
+end

data/test/test_script_util.rb

@@ -0,0 +1,37 @@
+
+require 'helper'
+
+module Bixby
+module Test
+
+class TestScriptUtil < TestCase
+
+  include Bixby::ScriptUtil
+
+  def setup
+    super
+    @old_require_paths = $:.dup
+  end
+
+  def teardown
+    super
+    $:.reject!{ |s| !@old_require_paths.include?(s) }
+  end
+
+  def test_use_bundle
+    use_bundle "test_bundle"
+    assert $:.find{ |s| s =~ %r(test_bundle/lib) }
+    assert Module.const_defined?(:TestBundle)
+  end
+
+  def test_systemu
+    cmd = systemu("dir")
+    assert cmd
+    assert cmd.success?
+    refute cmd.fail?
+  end
+
+end
+
+end # Test
+end # Bixby

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bixby-client
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Chetan Sarva
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-29 00:00:00.000000000 Z
+date: 2013-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bixby-common
@@ -221,19 +221,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: micron
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '4.7'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
@@ -354,11 +354,18 @@ files:
 - test/bixby-client/test_command.rb
 - test/bixby-client/test_platform_util.rb
 - test/helper.rb
+- test/patch/test_shellout.rb
 - test/support/root_dir/etc/bixby.yml
 - test/support/root_dir/etc/id_rsa
 - test/support/root_dir/etc/server
 - test/support/root_dir/etc/server.pub
+- test/support/root_dir/repo/vendor/test_bundle/bin/cat
+- test/support/root_dir/repo/vendor/test_bundle/bin/echo
+- test/support/root_dir/repo/vendor/test_bundle/digest
+- test/support/root_dir/repo/vendor/test_bundle/lib/test_bundle.rb
+- test/support/root_dir/repo/vendor/test_bundle/manifest.json
 - test/test_bixby-client.rb
+- test/test_script_util.rb
 homepage: http://github.com/chetan/bixby-client
 licenses:
 - MIT
@@ -379,7 +386,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.0
 signing_key: 
 specification_version: 4
 summary: Bixby Client