warehaus 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2cf2e67f57b21ffa49d9df3452ad9f618ee7b2a5
-  data.tar.gz: 0d38310e2a73d1f01a77ed0ab4fed4e3e5cc92d5
+  metadata.gz: b72ebba4ee312a30fe03cf7ddcf7023fca38b88d
+  data.tar.gz: 4aabbdc0f36b7d1a3bd300500f4b9f4a25208701
 SHA512:
-  metadata.gz: 9b27cd291efd923d3370f624f2d44fbbc589b6eb5a810df4aff17b7ceefdf29198d04afdd212dcfca36d50fd2e3b46e4a3eaa4b8973eec3a78c6cb046b366950
-  data.tar.gz: 671fdc2e459af846d4caae5d94febb5c25ba336c9031453168aad1294f233e59183f6bcb269e8b38f2ca79b30f863cf8c0794d9841c25aab744d6bc6c8c3b207
+  metadata.gz: 9868913e46d474d36487262513cd3dc2c0150c17a572d7d658b6beea10b6036e6f82900f20e68a41a9f426b8c93460389be278b3c4e0e5e447327bdd5d4e671d
+  data.tar.gz: 2f92512d476e417b2bfe89d83aa56b9e72badac91205493561193ab66c07fbe2d574b192580e1a784f97f43d0308ab9f85c0468d0bebd6d46d4559032d19dcf6

data/lib/warehaus.rb

@@ -3,7 +3,6 @@ require "httparty"
 require "json"
 require "zip"
 require "fileutils"
-require "pry"
 
 module Warehaus
 	$mode = "quiet"
@@ -19,6 +18,7 @@ module Warehaus
 		def initialize(url_or_id, dir='./', name='warehouse-model')
 			@name = name
 			@path = dir
+			@model_path = @path + '/' + @name
 			@options = {
 				:query => {
 					:id => parse_input(url_or_id)
@@ -67,13 +67,13 @@ module Warehaus
 		end
 
 		def write_kmz
-			FileUtils::mkdir_p "#{@path}/#{@name}/.tmp"
+			FileUtils::mkdir_p "#{@model_path}/.tmp"
 			log("📝  Writing KMZ file")
 			begin
-				File.open("#{@path}/#{@name}/.tmp/#{@name}.kmz", "wb") do |f|
+				File.open("#{@model_path}/.tmp/#{@name}.kmz", "w+") do |f|
 					f.write @kmz
 				end
-				FileUtils::mv "#{@path}/#{@name}/.tmp/#{@name}.kmz", "#{@path}/#{@name}/.tmp/#{@name}.zip"
+				FileUtils::mv "#{@model_path}/.tmp/#{@name}.kmz", "#{@model_path}/.tmp/#{@name}.zip"
 			rescue Exception => e
 				return raise_error e.message
 			end
@@ -81,10 +81,10 @@ module Warehaus
 
 		def unzip_kmz
 			log("📁  Creating model directory")
-			FileUtils::mkdir_p "#{@path}/#{@name}/untitled"
+			FileUtils::mkdir_p "#{@model_path}/untitled"
 
 			log("🎊  Cracking open the ZIP file")
-			Zip::File.open("#{@path}/#{@name}/.tmp/#{@name}.zip") do |zip_file|
+			Zip::File.open("#{@model_path}/.tmp/#{@name}.zip") do |zip_file|
 				
 				valid_paths = zip_file.entries.select do |entry|
 					(entry.name =~ /models\//) != nil
@@ -93,9 +93,9 @@ module Warehaus
 				valid_paths.each do |entry|
 
 					if entry.name =~ /\.dae$/
-						dest = "#{@path}/#{@name}/#{@name}.dae"
+						dest = "#{@model_path}/#{@name}.dae"
 					else
-						dest = "#{@path}/#{@name}/#{entry.name.match(/models\/(.*)$/)[1]}"
+						dest = "#{@model_path}/#{entry.name.match(/models\/(.*)$/)[1]}"
 					end
 
 					entry.extract(dest)
@@ -105,7 +105,7 @@ module Warehaus
 
 		def cleanup
 			log("🛀  Cleaning up")
-			FileUtils.rm_rf("#{@path}")
+			FileUtils.rm_rf("#{@model_path}/.tmp")
 		end
 
 		def unbox
@@ -120,7 +120,7 @@ module Warehaus
 		end
 
 		def erase
-			FileUtils.rm_rf "#{@path}/#{@name}"
+			FileUtils.rm_rf "#{@model_path}"
 		end
 
 		def raise_error(msg)
@@ -133,7 +133,8 @@ module Warehaus
 
 		def self.from_hash(hash)
 			hash[:models].each do |k, v|
-				getter = self.new(v, "#{hash[:dir]}/#{k}", k)
+
+				getter = self.new(v, "#{hash[:dir]}", k.to_s)
 				getter.unbox
 			end
 		end

data/lib/warehaus/version.rb

@@ -1,3 +1,3 @@
 module Warehaus
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: warehaus
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Erik Sälgström Peterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-14 00:00:00.000000000 Z
+date: 2014-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler