fruit_to_lime 0.8.1 → 0.8.2

data/lib/fruit_to_lime/templating.rb

@@ -1,5 +1,5 @@
 require "fileutils"
-
+require 'open3'
 module FruitToLime
 	class Templating
 		def initialize(path)
@@ -10,19 +10,37 @@ module FruitToLime
 	    	Dir.entries(@path).select { |d| d != '.' && d != '..' }
 		end
 
+		def exec_but_dont_show_unless_error(cmd)
+			std_out_value = []
+			Open3.popen3(cmd) do |stdin, stdout, stderr, wait_thr|
+				while std_line = stdout.gets
+					std_out_value<<std_line
+				end
+
+				exit_status = wait_thr.value 
+				if !exit_status.success?
+					puts "Failed with #{exit_status}"
+					puts "std_out_value"
+					puts std_out_value
+					
+					raise "failed exec #{cmd}"
+				end
+			end
+		end
+
 		def unpack(name, path)
 			template = list.find { |t| t == name }
 			if template
 				unpackedname = name
 
-	    		puts "Unpacking template #{name} to #{path}"
-	    		FileUtils.cp_r File.expand_path(name, @path), path
+				puts "Unpacking template #{name} to #{path}"
+				FileUtils.cp_r File.expand_path(name, @path), path
 
-	    		# Now make sure all gems in template are installed
-	    		puts "Making sure all needed gems are present"
-	    		Dir.chdir(File.expand_path(unpackedname, path)) do
-	 		   		`bundle install`
-	 		   	end
+				# Now make sure all gems in template are installed
+				puts "Making sure all needed gems are present"
+				Dir.chdir(File.expand_path(unpackedname, path)) do
+					exec_but_dont_show_unless_error('bundle install --verbose')
+				end
 				true
 			else
 				puts "Unable to find template #{name}"

data/spec/templating_spec.rb

@@ -1,6 +1,14 @@
 require 'fileutils'
 require 'tmpdir'
 
+def execute_command_with_success(cmd)
+	system(cmd)
+	if ! $?.success?
+		puts "Failed with #{$?}"
+		raise "failed! #{cmd}"
+	end
+end
+
 describe 'Templating' do
 	let(:templating) { FruitToLime::Templating.new(File.expand_path("../templates", File.dirname(__FILE__))) }
 	
@@ -21,8 +29,8 @@ describe 'Templating' do
 			templating.list().each {|t|
 				templating.unpack t, unpack_path
 				Dir.chdir(File.expand_path(t, unpack_path)) do
-   					`rake spec`
-   				end
+					execute_command_with_success('rake spec')
+				end
 			}
 		end
 

data/templates/csv/spec/tomodel_spec.rb

@@ -5,7 +5,7 @@ describe 'ToModel' do
     before(:all) do
         toModel = ToModel.new
         organizations_file =File.join(File.dirname(__FILE__), 'sample_data', 'organizations.csv')
-        @model = toModel.to_model(organizations_file, persons_file)        
+        @model = toModel.to_model(organizations_file)        
     end
     it "will find something with a name" do
         organization = @model.organizations[0]

data/templates/excel/lib/tomodel.rb

@@ -32,8 +32,8 @@ class Cli < Thor
      desc "to_go ORGANIZATION FILE", "Converts excel file to Go xml format. ORGANIZATIONS is path to input file. FILE is output file where Go xml will go."
     def to_go(organizations, file = nil)
         file = 'export.xml' if file == nil
-        scala = ScalaToModel.new()
-        model = scala.to_model(organizations)
+        toModel = ToModel.new()
+        model = toModel.to_model(organizations)
         model.serialize_to_file(file)  
     end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: fruit_to_lime
 version: !ruby/object:Gem::Version
-  version: 0.8.1
+  version: 0.8.2
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-19 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: iso_country_codes
@@ -45,6 +45,22 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement