c0_setup 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9194b29571e83db5e180db0266f7f06849f59ddd
-  data.tar.gz: d220d752f970500775088eafa41ef046ccd99c68
+  metadata.gz: b6a01ce6c1e3c1498176911e00f5d180df91e162
+  data.tar.gz: 4dcc4199f6921eb356e4464eecd388a90bc26a1a
 SHA512:
-  metadata.gz: 43cf2c15b6b671a240f8d976baf127447984e38b3fff7b68447f4183cf589530b5c01af5f257ce90306f36a410d35a7bd2d14ffde13121fbec0676800964f903
-  data.tar.gz: 1e5b981f1b056a8b22c6e89a83304549caecef7b45ca05a08e5ac9704eb28c134dc461a9a7cc5b4327ebbfc48fffbf7a38fdc414777d33dc680c3a2aa44c8d66
+  metadata.gz: b84c98771760ba9fc7f61b32d548590f9f928d40874c73acc96c59a6f1bf61534462a82feaab36c7dcff8bd10a9f4988d476ffc584fc9f931e70e12d899246ec
+  data.tar.gz: 8ea3cf55881a69508d022bf5a20a540edcc5364983b00c9fe2c6e3ffbb7984b0a071732a8b6e5b1c2aa72c18a2f230eb1cedb0c39c8009f648da09eed1c18333

data/bin/c0_setup

@@ -11,7 +11,7 @@ unless ARGV[0].nil? or ARGV[0] != "install"
 	puts result
 	puts "make sure you restart your terminal session for any changes to take effect" if !result.empty?
 else
-	puts "to install c0 utils (cc0 and coin), try again 'cc0-setup install"
+	puts "to install c0 utils (cc0 and coin), try again 'cc0_setup install"
 end
 
 

data/lib/c0_setup.rb

@@ -21,25 +21,16 @@ class C0Setup
 			result.push ".c0 folder already exists, remove it and retry if broken"
 			return result
 		end
-		if to_do.include? "cc0"
-			if install_cc0
-				result.push "successfully installed cc0"
+		if to_do.include? "cc0" and to_do.include? "coin"
+			if install_lib
+				result.push "successfully installed cc0 and coin"
 			else
-				result.push "failed to install cc0"
+				result.push "failed to install cc0 and coin"
 			end
-		else
-			result.push "cc0 is already installed somewhere, remove it and retry if broken"
-		end
-		if to_do.include? "coin"
-			if install_coin
-				result.push "successfully installed coin"
-			else
-				result.push "failed to install coin"
-			end
-		else
-			result.push "cc0 is already installed somewhere, remove it and retry if broken"
+		else	
+			result.push "coin or cc0 is already installed somewhere, remove it and retry if broken"
 		end
-		return result
+
 	end
 
 	# check for things that don't exist yet
@@ -63,43 +54,28 @@ class C0Setup
 	def create_runpath
 		Dir.chdir(File.expand_path("~")) do
 			Dir.mkdir ".c0"
-			File.new ".bashrc" unless File.exist? ".bashrc"
+			File.new("#{File.expand_path("~")}/.bashrc", "w+") unless File.exist? ".bashrc"
 			File.open(".bashrc", "a") do |file|
-				file.puts "export PATH=$PATH:~/.c0"
+				file.puts "export PATH=$PATH:~/.c0/bin"
 			end
-			in_path = File.open(".bashrc", "r").read.include? "export PATH=$PATH:~/.c0"
+			in_path = File.open(".bashrc", "r").read.include? "export PATH=$PATH:~/.c0/bin"
 			return (in_path and Dir.exist? ".c0")
 		end
 	end
-
-	def install_cc0
-	# copy the cc0 binary to "~/.c0"
+	# copy the c0 lib to "~/.c0" (OS specific)
+	def install_lib
 		user = File.expand_path("~")
-		Dir.chdir(File.dirname __dir__) do
-			if get_os == "darwin"
-				FileUtils.cp("./cc0_mac", "#{user}/.c0/cc0")
-			elsif get_os == "linux"
-				FileUtils.cp("./cc0_linux", "#{user}/.c0/cc0")
-			end	
-		end
-		return File.exist?("#{user}/.c0/cc0")
+		if get_os == "darwin"
+			`tar -xvzf #{File.expand_path(File.dirname __dir__)}/c0_mac.tar.gz -C #{user}/.c0`
+		elsif get_os == "linux"
+			`tar -xvzf #{File.expand_path(File.dirname __dir__)}/c0_linux.tar.gz -C #{user}/.c0`
+		end	
+		return (File.exist?("#{user}/.c0/bin/cc0") and File.exist?("#{user}/.c0/bin/coin"))
 	end
 
-	def install_coin
-	# copy the coin binary to "~/.c0"
-		user = File.expand_path("~")
-		Dir.chdir(File.dirname __dir__) do
-			if get_os == "darwin"
-				FileUtils.cp("./coin_mac", "#{user}/.c0/coin")
-			elsif get_os == "linux"
-				FileUtils.cp("./coin_linux", "#{user}/.c0/coin")
-			end	
-		end
-		return File.exist?("#{user}/.c0/coin")
-	end
-
-	def which(cmd)
+	
 	# check for the presence of a binary in $PATH
+	def which(cmd)
 		exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
 		ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
 			exts.each do |ext|
@@ -110,7 +86,7 @@ class C0Setup
 		return nil
 	end
 
-	
+	# figure out the os
 	def get_os
 		result = ""
 		os = RbConfig::CONFIG['host_os']
@@ -123,4 +99,3 @@ class C0Setup
   	end
 
 end
-

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: c0_setup
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Ryan Brigden
@@ -18,10 +18,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/c0_setup
-- cc0_linux
-- cc0_mac
-- coin_linux
-- coin_mac
+- c0_linux.tar.gz
+- c0_mac.tar.gz
 - lib/c0_setup.rb
 homepage: https://github.com/rbrigden
 licenses: []