oliver 1.6.3 → 1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a018083f29a78e5e8b047eecc3a7fc160c2f5298
-  data.tar.gz: fea413d6340a753dca2932ba446c0859b5e75385
+  metadata.gz: 46f04ee1c2e862d1138be0d1b068b53779c45dad
+  data.tar.gz: 3ad99a979b36bcc0faa4917a331100b1f76fb16a
 SHA512:
-  metadata.gz: 0e3ffb1f48aa28454e092c229f160759b3260299c6533cf7aa0c2e11da61bda17eda7efd980244d7d0698831d4c42c6e8a16006a46b31807c0edee7a367ccdeb
-  data.tar.gz: b27bf4287ffd2436a09de7bba1186f699c14c6a16af1d4a47ae620af58316711a40a555ca703820e155780191272a6007b3d001d746804c55fcb604f323ba80b
+  metadata.gz: f9503166f657d4c93cc8b3eb961ffad04d1190dcc1d182ecade32e474b7dd95a4eeb7c24429e71006ec7cb5c5eb73f4c4a4cb98f42e096187917e5dd354e7fe7
+  data.tar.gz: 10e85d2abfc6a3acaade6e63f8237aeb23a8225628490f68dff2b44bd5b80ba59fe2efe45e81c64ffb1bcc7c893e32363df75ddc0e1c63ecbaac768024d7e070

data/README.md

@@ -116,11 +116,15 @@ $ olive init
 ```yaml
 ---
 repos:
-   - "trommel/oliver"
-   - "istx25/dotfiles" # add any repo(s)
+  trommel:
+    - "oliver"
+    - "textymous"
+  istx25:
+    - "Fluorescent"
+    - "dotfiles"
 ---
 
-# use 3 spaces for indentation, not tabs!
+# use 3 spaces for indentation, not tabs! :P
 # I spent, like, an hour trying to fix a non-existent bug because of this
 # smh so hard
 # by the way, this is YAML, for anyone interested

data/attempts/run.rb

@@ -0,0 +1,24 @@
+# Require libraries
+require 'awesome_print'
+require 'yaml'
+
+# Read and parse the YAML from the file
+file = File.read('test.yml')
+yaml = YAML.load(file)
+
+# 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`
+			if File.directory?(repo)
+				puts "#{repo} was successfully cloned."
+			else
+				puts "An error occured while cloning #{repo}"
+			end
+		else
+			puts "#{repo} already exists."
+		end
+	end
+end

data/attempts/test.yml

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

data/lib/oliver/argument_files/init.rb

@@ -15,7 +15,8 @@ def init
   if !File.file?(Name::OLIVER)
     File.open(Name::OLIVER, 'w') do |file|
       file.write("---\nrepos:\n")
-      file.write("   - \"trommel/oliver\"\n---\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."
     end
   else

data/lib/oliver/argument_files/install.rb

@@ -1,11 +1,11 @@
 def install
 
-  # Back up your files, man
-  # backup_directory_name = '.backup'
-  # Dir.mkdir backup_directory_name unless File.directory? backup_directory_name
+  success = "#{Rainbow('Success').underline.green}:"
+  warning = "#{Rainbow('Warning').underline.yellow}:"
+  error = "#{Rainbow('Error').underline.red}:"
 
   # Fix this ASAP
-  if $final['repos'].nil?
+  if $yaml['repos'].nil?
     message = "This will normally return a bug, so I'm just not going to do it.
 You have an empty repos list, though, and that's what's causing this bug.
 Try adding something to the list for the time being."
@@ -14,45 +14,42 @@ Try adding something to the list for the time being."
   end
 
   listed_repos = []
-
-  $final['repos'].each do |what|
-    listed_repos.push(what)
-  end
-  $final['repos'].each do |url|
-
-    # Split the url in half
-    splitted = url.split '/'
-    repo = splitted[1]
-    current_repos = Dir.entries '.'
-    ['.', '..', '.backup', Name::OLIVER].each do |i|
-      current_repos.delete(i)
+  $yaml['repos'].map do |username, repos|
+    repos.each do |repo|
+      listed_repos.push(repo)
     end
+  end
 
-    # Clone the repo if it doesn't already exist
-    if !File.directory?(repo)
-      `git clone git://github.com/#{url} --quiet`
-      if File.directory?(repo)
-        puts "#{Rainbow(repo).green}/ has been successfully cloned."
-      else
-        puts "There was an error cloning #{Rainbow(repo).red}/."
-      end
-    else
-      puts "#{Rainbow(repo).red}/ already exists."
-    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`
+  			if File.directory?(repo)
+  				puts "#{success} #{repo}/ has been cloned."
+  			else
+  				puts "#{error} Cloning #{repo}/ failed."
+  			end
+  		else
+  			puts "#{warning} #{repo}/ already exists."
+  		end
+  	end
+  end
 
-    # If the directory doesn't exist
-    # in `Name::OLIVER`, move it to .backup
-    current_repos.each do |directory_thing|
-      if !listed_repos.to_s.include?(directory_thing) &&
-                          File.directory?(directory_thing)
-        `yes | rm -r #{directory_thing}`
-        # `mv #{directory_thing} .backup`
-      else
-        # do nothing at all
-        # backup_color = Rainbow('.backup').red
-        # repo_color = Rainbow(repo).red
-        # puts "There was an error moving #{repo_color}/ to #{backup_color}/"
-      end
+  # If the directory doesn't exist
+  # in `Name::OLIVER`, delete it
+  # This is an extreme hack
+  current_repos = Dir.entries '.'
+  ['.', '..', '.backup', Name::OLIVER].each do |i|
+    current_repos.delete(i)
+  end
+  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) "
+      `yes | rm -r #{directory}` if STDIN.gets.chomp.downcase == 'y'
     end
   end
+
 end

data/lib/oliver/argument_files/list.rb

@@ -4,7 +4,7 @@
 #   # todo: if user has multiple repos,
 #   # have one user key with an array of
 #   # the user's repos
-#   $final['repos'].each do |thing|
+#   $yaml['repos'].each do |thing|
 #     new_thing = thing.split('/')
 #     listed_repos.push(new_thing)
 #   end
@@ -14,7 +14,7 @@
 # Simple enough :P
 def list
   counter = 0
-  $final['repos'].each do |thing|
+  $yaml['repos'].each do |thing|
     repo = thing.split('/')[1] # might as well discard the username
     if File.directory?(repo)
       print Rainbow(repo).green

data/lib/oliver/file_manager.rb

@@ -1,8 +1,8 @@
 def file_manager
   unless ARGV.nil?
     if File.file? Name::OLIVER
-      body = File.read(Name::OLIVER.chomp)
-      $final = YAML.load(body)
+      body = File.read(Name::OLIVER)
+      $yaml = YAML.load(body)
     else
       puts "#{Rainbow(Name::OLIVER).red} does not exist."
     end

data/lib/oliver/version.rb

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

data/run.rb

@@ -0,0 +1,23 @@
+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

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.6.3
+  version: '1.7'
 platform: ruby
 authors:
 - Josh
@@ -68,6 +68,8 @@ files:
 - LICENSE
 - README.md
 - Rakefile
+- attempts/run.rb
+- attempts/test.yml
 - bin/olive
 - bin/oliver
 - lib/oliver.rb
@@ -83,7 +85,9 @@ 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: {}