oliver 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: afaedbe728c36e3d1940909c711ba421cb241054
-  data.tar.gz: 915821dbaa27de4530325bec8f92d62141a10dbf
+  metadata.gz: a455aed1b36608bdb77e8ea7d91743dc3dcbfd1a
+  data.tar.gz: 2cdf9f5bc16b093d318441064ccf119593636e4c
 SHA512:
-  metadata.gz: 2f21cda30a9eec7b3c0cbfb38c7ee675847fe8aefe65913acfd336890ad304ed8d4da39e5fb9de80e01c22f2675a2d3c4dbedc10f2e30f545649957a6e9ba0a4
-  data.tar.gz: bc37c34cf69145540dd12418446f80d6fe9708f1cd19088c75807e0d933b8dc4b92f0ecceaaa624b32d1065863539333fa6ddf8249532ab4393530de70ea5304
+  metadata.gz: fda0c3d5755f1b2d0e90cb60f829d26ffbc6fded99655c6f281c2c37a9fd1795c82b5bde9557e3f745c10ab155b4f56228210864b1f23d0609fc7043370ed020
+  data.tar.gz: de49f5e598580be8834a82915689b1637ba208d7c6615255fc43628c7f648d32622b4be1a6d91d3df48959b3d0c4a700f7cef83bd8ee43664f6c3f4ebddb3c1c

data/README.md

@@ -122,6 +122,8 @@ repos:
   istx25:
     - "Fluorescent"
     - "dotfiles"
+  misc: # use the misc category for old syntax
+    - "trommel/calkoolator"
 ---
 
 # use 3 spaces for indentation, not tabs! :P

data/community/README.md

@@ -0,0 +1,16 @@
+community
+=========
+
+there might be a time where you just want a ton
+of random iOS projects, or something.
+
+maybe you don't want to write out a long list of repos.
+thank the heavens for the community(!)
+
+hopefully people will start submitting their `.Olivefile`s
+and we can all collaborate and stuff. it (might) be cool :)
+
+if you want to be a part of this, just fork Oliver and add your
+Olivefile into this directory. name your Olivefile the category of
+what your Olivefile is for-what your GitHub username is.yml.
+for example, `ruby-projects-trommel.yml`

data/lib/oliver/argument_files/init.rb

@@ -6,8 +6,13 @@ def init
       dir_name = ARGV[2]
     end
     if ARGV[1].downcase == '--directory' || ARGV[1].downcase == '-d'
-      Dir.mkdir dir_name
-      Dir.chdir(dir_name)
+      if !File.directory?(dir_name)
+        Dir.mkdir(dir_name)
+        Dir.chdir(dir_name)
+      else
+        puts "#{Rainbow('Error').underline.red}: #{dir_name}/ already exists."
+        exit
+      end
       puts "#{Rainbow(dir_name).green}/ has been created."
     end
   end
@@ -17,7 +22,9 @@ def init
       file.write("---\nrepos:\n")
       file.write("   trommel:\n      - \"oliver\"\n---\n")
       dir_name = '.' if dir_name.nil?
-      puts "#{Rainbow(dir_name).green}/#{Rainbow(Name::OLIVER).green} has been created."
+      green_dir_name = Rainbow(dir_name).green
+      green_oliver_file_name = Rainbow(Name::OLIVER).green
+      puts "#{green_dir_name}/#{green_oliver_file_name} has been created."
     end
   else
     puts "#{Rainbow(Name::OLIVER).red} already exists."

data/lib/oliver/argument_files/install.rb

@@ -1,5 +1,6 @@
 def install
 
+  # Make these public later :P
   success = "#{Rainbow('Success').underline.green}:"
   warning = "#{Rainbow('Warning').underline.yellow}:"
   error = "#{Rainbow('Error').underline.red}:"
@@ -13,29 +14,52 @@ Try adding something to the list for the time being."
     exit
   end
 
+  # Create the empty listed_repos array for later
   listed_repos = []
+
+  # Map out the username and repos(array)
   $yaml['repos'].map do |username, repos|
-    if repos.nil?
-      puts "#{error} Your repos folder is empty..?"
+    # Exit with error if the username or repos is empty
+    if username.nil?
+      puts "#{error} Your usernames look a little nil."
       exit
     end
-    repos.each do |repo|
-      listed_repos.push(repo)
+    if repos.nil?
+      puts "#{error} Your repos look a little nil."
+      exit
     end
-  end
-
-  # Map out the username and repos(array)
-  $yaml['repos'].map do |username, repos|
   	# Assign individual repo from repos array
   	repos.each do |repo|
-  		if !File.directory?(repo)
-  			`git clone git://github.com/#{username}/#{repo} --quiet`
+      # Add each repo to the listed_repos array
+      repos.each do |repo|
+        listed_repos.push(repo)
+      end
+      if username.downcase == 'misc'
+        split = repo.split('/')
+        if !File.directory?(split[1])
+          `git clone git://github.com/#{repo} --silent`
+          if File.directory?(split[1])
+            puts "#{success} #{split[1]}/ was cloned."
+          else
+            puts "#{error} #{split[1]} was not cloned."
+          end
+        end
+        exit
+      end
+      if !File.directory?(repo)
+        # Clone the repo if the directory doesn't already exist
+        `git clone git://github.com/#{username}/#{repo} --quiet`
   			if File.directory?(repo)
+          # If the directory exists after the repo
+          # has been cloned, give a success message
   				puts "#{success} #{repo}/ has been cloned."
   			else
+          # If the directory doesn't exist after the
+          # has been cloned, give an error message
   				puts "#{error} Cloning #{repo}/ failed."
   			end
   		else
+        # Give a warning message if the repo already exists
   			puts "#{warning} #{repo}/ already exists."
   		end
   	end
@@ -51,9 +75,8 @@ Try adding something to the list for the time being."
   current_repos.each do |directory|
     unless listed_repos.to_s.include?(directory) &&
                         File.directory?(directory)
-      print "#{warning} Would you like to delete #{directory}/? (y/n) "
+      print "#{warning} Would you like to delete #{directory}/? (y/n): "
       `yes | rm -r #{directory}` if STDIN.gets.chomp.downcase == 'y'
     end
   end
-
 end

data/lib/oliver/argument_files/list.rb

@@ -21,10 +21,8 @@ def list
     else
       print Rainbow(repo).red
     end
-    if counter % 4 == 0
-      print "\t"
-    end
-    counter =+ 1
+    print "\t" if counter % 4 == 0
+    counter += 1
   end
   puts
 end

data/lib/oliver/version.rb

@@ -1,5 +1,5 @@
 # The main module for
 # Oliver's version
 module Oliver
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Josh
@@ -72,6 +72,7 @@ files:
 - attempts/test.yml
 - bin/olive
 - bin/oliver
+- community/README.md
 - lib/oliver.rb
 - lib/oliver/argument_files/add.rb
 - lib/oliver/argument_files/help.rb
@@ -85,9 +86,7 @@ files:
 - lib/oliver/oliver_file_name.rb
 - lib/oliver/version.rb
 - oliver.gemspec
-- run.rb
 - spec/TESTING.md
-- test.yml
 homepage: https://github.com/trommel/oliver
 licenses: []
 metadata: {}

data/run.rb

@@ -1,23 +0,0 @@
-require 'yaml'
-
-file = File.read('test.yml')
-$yaml = YAML.load(file)
-
-def clone
-  $yaml['repos'].map do |username, repos|
-    repos.each do |repo|
-      if !File.directory?(repo)
-        `git clone git://github.com/#{username}/#{repo} --quiet`
-        if File.directory? repo
-          puts "Successfully cloned #{username}/#{repo}."
-        else
-          puts "There was an error while cloning #{repo}."
-        end
-      else
-        puts "#{repo} already exists."
-      end
-    end
-  end
-end
-
-clone

data/test.yml

@@ -1,10 +0,0 @@
----
-repos:
-        trommel:
-                - "oliver"
-                - "calkoolator"
-
-        istx25:
-                - "dotfiles"
-                - "Fluorescent"
----