mortar 0.5.0 → 0.5.1

data/lib/mortar/helpers.rb

@@ -19,7 +19,7 @@
 
 require 'fileutils'
 require "vendor/mortar/okjson"
-require "curb"
+require 'open-uri'
 
 module Mortar
   module Helpers
@@ -46,10 +46,21 @@ module Mortar
     end
 
     def download_to_file(url, path, mkdir_p=true)
-      c = Curl::Easy.new(url)
-      c.on_progress {|dl_total, dl_now, ul_total, ul_now| redisplay("Downloading #{path}: #{dl_now.to_i} of #{dl_total.to_i}"); true }
-      c.perform
-      write_to_file(c.body_str, path, mkdir_p)
+      content_length = 0
+      
+      set_content_length = lambda do |l|
+        content_length = l
+      end
+      set_progress = lambda do |p|
+        redisplay("Downloading #{path}: #{p.to_i} of #{content_length.to_i}")
+      end
+      
+      open(url,
+        :content_length_proc => set_content_length,
+        :progress_proc => set_progress) do |f|
+          write_to_file(f.read, path, mkdir_p)
+      end
+      
     end
 
     def display(msg="", new_line=true)

data/lib/mortar/version.rb

@@ -16,5 +16,5 @@
 
 module Mortar
   # see http://semver.org/
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mortar
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: 
   segments: 
   - 0
   - 5
-  - 0
-  version: 0.5.0
+  - 1
+  version: 0.5.1
 platform: ruby
 authors: 
 - Mortar Data
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-17 00:00:00 Z
+date: 2013-01-23 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mortar-api-ruby
@@ -63,25 +63,10 @@ dependencies:
         version: "2.1"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: curb
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 0
-        - 8
-        version: "0.8"
-  type: :runtime
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: excon
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -92,11 +77,11 @@ dependencies:
         - 15
         version: "0.15"
   type: :development
-  version_requirements: *id005
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: fakefs
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -106,11 +91,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id006
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: gem-release
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -120,11 +105,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rake
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -134,11 +119,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id008
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
   name: rr
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -148,11 +133,11 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id009
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -162,7 +147,7 @@ dependencies:
         - 0
         version: "0"
   type: :development
-  version_requirements: *id010
+  version_requirements: *id009
 description: Client library and command-line tool to interact with the Mortar service.
 email: support@mortardata.com
 executables: