turbot 0.0.46 → 0.0.47

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 66019d75113e4ff7d97e4543facdffe032321927
-  data.tar.gz: d31bb1bd2f728fbbc2052eeb52f2ac02c4e05953
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    YjBhMjQ0ZGJlMWE3MmUzM2RmYWQyN2YyNjkzMGU5M2YyNzhhNjE1Zg==
+  data.tar.gz: !binary |-
+    Y2ExZmNmYjliYWRiOGZhNjE5NGMxZTJkYjQ0ODM2NTM2YjAzNmQ3NA==
 SHA512:
-  metadata.gz: 910128b476fd7c49f43cfe34d131b5c6f3d7c948fe7e292879b55c6b99acd553a0b6214e5fb95f45e2555f99e63773a86f61e2ea5ab23444ce92e45d12d5ca4e
-  data.tar.gz: 8dcb910a5f2c2f1b8011bc1598dbd1d6972e5c1e86499179e4b8c268e11c389de9ebb35045fd7d53a8cc818cf32d8694553f510e456790c9568692072942934a
+  metadata.gz: !binary |-
+    ZTE5OWMyODM0NjNkNGI1Y2U3MzU2MTQwZDZiZWFhY2ViMDI1NjRlNTk2NTky
+    MDIyNDc3Y2I1YzZjNTAxMWY2NzdjN2RkOWZhNzYwZmZmYTIzYWM3YmQwOTVj
+    YTBiNmI5ODk0MzM0MGNhZGNkM2U0Y2VkMjEzNWM3NTVlNjIxOWE=
+  data.tar.gz: !binary |-
+    M2Y3Njk0ZDhjNTFkYjBlODA3MDYzMjgwMWVkZTliOWQ3ZTI0MDY0NDU3OWUx
+    NDU4Nzg5MjljM2EzZTFhMzY5YjZlNTAyNjY3OWU3NjE3MGViMzgwMzQxZGVk
+    Yzc5OTAyMjExYTgwZTViMmZmNmU3ZmQyMTg4N2FkOTI3YzQwM2E=

data/lib/turbot/command/bots.rb

@@ -172,15 +172,9 @@ class Turbot::Command::Bots < Turbot::Command::Base
     error("Aborting push") if !confirmed.downcase.empty? && confirmed.downcase != "y"
     working_dir = Dir.pwd
     manifest = parsed_manifest(working_dir)
-    #archive_file = File.join(working_dir, 'tmp', "#{manifest['bot_id']}.zip")
     archive = Tempfile.new(bot)
     archive_path = "#{archive.path}.zip"
-
-    Zip.continue_on_exists_proc = true
-    Zip::File.open(archive_path, Zip::File::CREATE) do |zipfile|
-      zipfile.add("manifest.json", manifest_path)
-      manifest['files'].each { |f| zipfile.add(f, File.join(working_dir,f)) }
-    end
+    create_zip_archive(archive_path, working_dir, manifest['files'] + ['manifest.json'])
 
     response = File.open(archive_path) {|file| api.update_code(bot, file)}
     case response
@@ -273,6 +267,10 @@ class Turbot::Command::Bots < Turbot::Command::Base
     puts "Sending to turbot... "
 
     runner = PreviewRunner.new(bot, api)
+    Signal.trap("INT") do
+      Process.kill("ABRT", runner.wait_thread[:pid])
+      runner.interrupt
+    end
     runner.run
   end
 
@@ -302,6 +300,24 @@ class Turbot::Command::Bots < Turbot::Command::Base
     hyphenated_name = type.to_s.gsub("_", "-").gsub(" ", "-")
     File.expand_path("../../../../schema/schemas/#{hyphenated_name}-schema.json", __FILE__)
   end
+
+  def create_zip_archive(archive_path, basepath, subpaths)
+    Zip.continue_on_exists_proc = true
+    Zip::File.open(archive_path, Zip::File::CREATE) do |zipfile|
+      subpaths.each do |subpath|
+        path = File.join(basepath, subpath)
+
+        if File.directory?(path)
+          Dir["#{path}/**/*"].each do |path1|
+            subpath1 = Pathname.new(path1).relative_path_from(Pathname.new(basepath))
+            zipfile.add(subpath1, path1)
+          end
+        else
+          zipfile.add(subpath, path)
+        end
+      end
+    end
+  end
 end
 
 class PreviewRunner < TurbotRunner::BaseRunner

data/lib/turbot/version.rb

@@ -1,3 +1,3 @@
 module Turbot
-  VERSION = "0.0.46"
+  VERSION = "0.0.47"
 end

data/spec/turbot/command/bots_spec.rb

@@ -86,4 +86,23 @@ describe Turbot::Command::Bots do
       end
     end
   end
+
+  describe '#create_zip_archive' do
+    it 'adds all given files to archive' do
+      dirs = ['a', 'b', 'a/p', 'b/p']
+      paths = ['a/p/x', 'a/y', 'b/p/x', 'b/y', 'z']
+
+      base_dir = Dir.mktmpdir
+      dirs.each {|dir| Dir.mkdir(File.join(base_dir, dir))}
+      paths.each {|path| FileUtils.touch(File.join(base_dir, path))}
+
+      command = Turbot::Command::Bots.new
+      archive_path = Tempfile.new('test').path
+      command.send(:create_zip_archive, archive_path, base_dir, ['a', 'b/p/x', 'b/y', 'z'])
+
+      Zip::File.open(archive_path) do |zipfile|
+        expect(zipfile.map {|entry| entry.to_s}).to match_array(paths + ['a/p/'])
+      end
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: turbot
 version: !ruby/object:Gem::Version
-  version: 0.0.46
+  version: 0.0.47
 platform: ruby
 authors:
 - Turbot
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-12 00:00:00.000000000 Z
+date: 2014-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: netrc
@@ -42,42 +42,42 @@ dependencies:
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 0.3.2
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: json-schema
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -126,14 +126,14 @@ dependencies:
   name: excon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Client library and command-line tool to deploy and manage apps on Turbot.
@@ -175,6 +175,23 @@ files:
 - lib/turbot/updater.rb
 - lib/turbot/version.rb
 - lib/vendor/turbot/okjson.rb
+- schema/schemas/company-schema.json
+- schema/schemas/includes/address.json
+- schema/schemas/includes/base-statement.json
+- schema/schemas/includes/company.json
+- schema/schemas/includes/filing.json
+- schema/schemas/includes/licence-data.json
+- schema/schemas/includes/officer.json
+- schema/schemas/includes/previous_name.json
+- schema/schemas/includes/share-parcel-data.json
+- schema/schemas/includes/share-parcel.json
+- schema/schemas/includes/subsidiary-relationship-data.json
+- schema/schemas/includes/total-shares.json
+- schema/schemas/licence-schema.json
+- schema/schemas/primary-data-schema.json
+- schema/schemas/share-parcel-schema.json
+- schema/schemas/simple-licence-schema.json
+- schema/schemas/subsidiary-relationship-schema.json
 - spec/helper/legacy_help.rb
 - spec/helper/pg_dump_restore_spec.rb
 - spec/schemas/dummy_schema.json
@@ -208,23 +225,6 @@ files:
 - templates/manifest.json
 - templates/python/scraper.py
 - templates/ruby/scraper.rb
-- schema/schemas/company-schema.json
-- schema/schemas/includes/address.json
-- schema/schemas/includes/base-statement.json
-- schema/schemas/includes/company.json
-- schema/schemas/includes/filing.json
-- schema/schemas/includes/licence-data.json
-- schema/schemas/includes/officer.json
-- schema/schemas/includes/previous_name.json
-- schema/schemas/includes/share-parcel-data.json
-- schema/schemas/includes/share-parcel.json
-- schema/schemas/includes/subsidiary-relationship-data.json
-- schema/schemas/includes/total-shares.json
-- schema/schemas/licence-schema.json
-- schema/schemas/primary-data-schema.json
-- schema/schemas/share-parcel-schema.json
-- schema/schemas/simple-licence-schema.json
-- schema/schemas/subsidiary-relationship-schema.json
 homepage: http://turbot.com/
 licenses:
 - MIT
@@ -235,18 +235,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Client library and CLI to deploy apps on Turbot.
 test_files: []
+has_rdoc: