oliver 1.7.3 → 1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: df3b5d6c2754e5047ac2a186c2a0929995b77d25
-  data.tar.gz: 088f465ab3f3dde7ab4e042e456cc7c87a8fcea0
+  metadata.gz: d4d9ab49c3e31bdebe189d1a1c2f2bf705729f97
+  data.tar.gz: dbc1a02fdd998eadbe761238f56730583d2df8f4
 SHA512:
-  metadata.gz: 1a46ea71140f8e81e1302126acc9b25dbde473dcbdcfa5b17e2085b0e6f9e656a77bf7a20878aa3e111783530204fdedc0a367b76dc0d9119aad9427a1e1ed91
-  data.tar.gz: e0c48f5d7ca851f3d42fc645472a815ad4ef51eca80706a0f12102a763ca82a8b5958a9b4ca1751138a9e9ba8c81db8483482ef758d3ad5dc6cb20e9da1b52ac
+  metadata.gz: f208312d2be3f008d60880c88fc26434b91f7363c2537b9014dc3e50f6653834014095628660c5c0cadfe4eb9b843bf29e286dedc4d17b21260287dae6916ad9
+  data.tar.gz: 2fbb46e9e6812ef8cd71610868bb037c709ad17a848e5fdcd5b9a5d94dddc0ee75839e9ec3cd8c315a900e0fa5c0f78c420f8ca80685c3b458a60a6e1bfc13ae

data/IDEAS.md

@@ -3,7 +3,7 @@ ideas
 
 ideas that should or have already been implemented.
 
-- [x] make the backup directory hidden (`.backup`)
+- [x] ~~make the backup directory hidden (`.backup`)~~
 
 - [ ] add verbose mode (`--verbose`) so things like `olive install` will have output like
 
@@ -25,7 +25,7 @@ prefs:
    - "no colour" # this too :P
 ```
 
-- [ ] when running `olive list`, list the repos that are currently in the directory against
+- [x] when running `olive list`, list the repos that are currently in the directory against
 the repos that are currently being tracked. repos that are in both (the `Olivefile` and the current directory)
 should be listed as green (using rainbow), and directories that are only found in one of the two options
 will be listed as red.
@@ -47,7 +47,7 @@ remove them from the list and run
 $ olive install
 ```
 
-I spent, like, 50 minutes on this and I can't figure out a good way
-to do it, though, so.. yeah
+~~I spent, like, 50 minutes on this and I can't figure out a good way
+to do it, though, so.. yeah~~
 
-I'll add it as soon as I can figure it out.
+~~I'll add it as soon as I can figure it out.~~

data/README.md

@@ -122,7 +122,7 @@ repos:
   istx25:
     - "Fluorescent"
     - "dotfiles"
-  misc: # use the misc category for old syntax
+  misc: # use the misc category for old syntax. these don't really work, yet
     - "trommel/calkoolator"
 ---
 
@@ -155,7 +155,7 @@ this will add it to the tracking list
 ```bash
 $ olive add username/repo
 ```
-### remove (move to `.backup`) and stop tracking a repo
+### remove (delete) and stop tracking a repo
 
 this will remove it from the tracking list
 and locally delete the repo
@@ -169,7 +169,7 @@ $ olive remove username/repo
 list all of the repos that're being tracked
 
 ```bash
-$ oliver list
+$ olive list
 ```
 
 ### update (`git pull`) each repo
@@ -178,7 +178,7 @@ essentially `cd` into each individual
 repo and run `git pull`
 
 ```bash
-$ oliver update
+$ olive update
 ```
 
 extras

data/lib/oliver.rb

@@ -1,25 +1,13 @@
-# holy shit, this is massive
-# twss
-require 'rainbow'
-require 'YAML'
-%w(oliver_file_name file_manager arguments version).each do |file|
-  require_relative "oliver/#{file}"
-end
+# Require files
+%w(rainbow YAML).each { |file| require file }
+require_relative 'oliver/version'
 
 # if the user doesn't want to use rainbow
 # just disable it completely
 Rainbow.enabled = false if ARGV[-1] == 'colour=off'
 
-# Right off the bat,
-# if the user doesn't specify even one argument
-# just give him some help and quit oliver
-if ARGV[0].nil?
-  help
-  exit
-end
-
 # Arguments
-arguments
+require_relative 'oliver/arguments'
 
-# just exit at this point
+# Just exit at this point
 exit

data/lib/oliver/argument_files/add.rb

@@ -1,5 +1,2 @@
-def add
-  argument?(1)
-  puts "todo: add (#{ARGV[1]}) to #{Name::OLIVER}"
-  # puts "added #{Rainbow(ARGV[1]).green} to #{Rainbow(Name::OLIVER).green}."
-end
+require_relative '../oliver_file_name'
+puts "TODO: add (#{ARGV[1]}) to #{Name::OLIVER}"

data/lib/oliver/argument_files/help.rb

@@ -1,3 +1,4 @@
+require_relative '../oliver_file_name'
 # Help the user with their heavy troubles
 def help
   helper = [

data/lib/oliver/argument_files/init.rb

@@ -1,32 +1,31 @@
-def init
-  unless ARGV[1].nil?
-    if ARGV[2].nil?
-      dir_name = 'olives'
+require_relative '../oliver_file_name'
+unless ARGV[1].nil?
+  if ARGV[2].nil?
+    dir_name = 'olives'
+  else
+    dir_name = ARGV[2]
+  end
+  if ARGV[1].downcase == '--directory' || ARGV[1].downcase == '-d'
+    if !File.directory?(dir_name)
+      Dir.mkdir(dir_name)
+      Dir.chdir(dir_name)
     else
-      dir_name = ARGV[2]
-    end
-    if ARGV[1].downcase == '--directory' || ARGV[1].downcase == '-d'
-      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."
+      puts "#{Rainbow('Error').underline.red}: #{dir_name}/ already exists."
+      exit
     end
+    puts "#{Rainbow(dir_name).green}/ has been created."
   end
+end
 
-  if !File.file?(Name::OLIVER)
-    File.open(Name::OLIVER, 'w') do |file|
-      file.write("---\nrepos:\n")
-      file.write("   trommel:\n      - \"oliver\"\n---\n")
-      dir_name = '.' if dir_name.nil?
-      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."
+if !File.file?(Name::OLIVER)
+  File.open(Name::OLIVER, 'w') do |file|
+    file.write("---\nrepos:\n")
+    file.write("   trommel:\n      - \"oliver\"\n---\n")
+    dir_name = '.' if dir_name.nil?
+    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."
 end

data/lib/oliver/argument_files/install.rb

@@ -1,82 +1,80 @@
-def install
+require_relative '../oliver_file_name'
+# Make these public later :P
+success = "#{Rainbow('Success').underline.green}:"
+warning = "#{Rainbow('Warning').underline.yellow}:"
+error = "#{Rainbow('Error').underline.red}:"
 
-  # Make these public later :P
-  success = "#{Rainbow('Success').underline.green}:"
-  warning = "#{Rainbow('Warning').underline.yellow}:"
-  error = "#{Rainbow('Error').underline.red}:"
-
-  # Fix this ASAP
-  if $yaml['repos'].nil?
-    message = "This will normally return a bug, so I'm just not going to do it.
+# Fix this ASAP
+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."
-    puts Rainbow(message).red
-    exit
-  end
+  puts Rainbow(message).red
+  exit
+end
 
-  # Create the empty listed_repos array for later
-  listed_repos = []
+# Create the empty listed_repos array for later
+listed_repos = []
 
-  # Map out the username and repos(array)
-  $yaml['repos'].map do |username, repos|
-    # Exit with error if the username or repos is empty
-    if username.nil?
-      puts "#{error} Your usernames look a little nil."
-      exit
-    end
-    if repos.nil?
-      puts "#{error} Your repos look a little nil."
-      exit
+# Map out the username and repos(array)
+$yaml['repos'].map do |username, repos|
+  # Exit with error if the username or repos is empty
+  if username.nil?
+    puts "#{error} Your usernames look a little nil."
+    exit
+  end
+  if repos.nil?
+    puts "#{error} Your repos look a little nil."
+    exit
+  end
+	# Assign individual repo from repos array
+	repos.each do |repo|
+    # Add each repo to the listed_repos array
+    repos.each do |repo|
+      listed_repos.push(repo)
     end
-  	# Assign individual repo from repos array
-  	repos.each do |repo|
-      # 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} --quiet`
-          if File.directory?(split[1])
-            puts "#{success} #{split[1]}/ was cloned."
-          else
-            puts "#{error} #{split[1]} was not cloned."
-          end
+    if username.downcase == 'misc'
+      split = repo.split('/')
+      if !File.directory?(split[1])
+        `git clone git://github.com/#{repo} --quiet`
+        if File.directory?(split[1])
+          puts "#{success} #{split[1]}/ was cloned."
+        else
+          puts "#{error} #{split[1]} was not cloned."
         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
-  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'
+      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
+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

data/lib/oliver/argument_files/list.rb

@@ -1,28 +1,12 @@
-# For later (possible) Hash implementation
-# def list
-#   listed_repos = []
-#   # todo: if user has multiple repos,
-#   # have one user key with an array of
-#   # the user's repos
-#   $yaml['repos'].each do |thing|
-#     new_thing = thing.split('/')
-#     listed_repos.push(new_thing)
-#   end
-#   puts listed_repos.to_h
-# end
-
-# Simple enough :P
-def list
-  counter = 0
-  $yaml['repos'].each do |thing|
-    repo = thing.split('/')[1] # might as well discard the username
-    if File.directory?(repo)
-      print Rainbow(repo).green
-    else
-      print Rainbow(repo).red
-    end
-    print "\t" if counter % 4 == 0
-    counter += 1
+counter = 0
+$yaml['repos'].each do |thing|
+  repo = thing.split('/')[1] # might as well discard the username
+  if File.directory?(repo)
+    print Rainbow(repo).green
+  else
+    print Rainbow(repo).red
   end
-  puts
+  print "\t" if counter % 4 == 0
+  counter += 1
 end
+puts

data/lib/oliver/argument_files/remove.rb

@@ -1,4 +1,2 @@
-def remove
-  argument?(1)
-  puts "todo: remove (#{ARGV[1]}) to #{Name::OLIVER}"
-end
+require_relative '../oliver_file_name'
+puts "TODO: remove (#{ARGV[1]}) to #{Name::OLIVER}"

data/lib/oliver/argument_files/update.rb

@@ -1,3 +1,2 @@
-def update
-  puts 'todo: pull updates from each tracked repo on the Olivefile'
-end
+require_relative '../oliver_file_name'
+puts "TODO: pull updates from each tracked repo on the #{Name::OLIVER}"

data/lib/oliver/arguments.rb

@@ -1,48 +1,38 @@
-# Assign 'files' variable to all of the argument files
-# (Make this automatic later on, but for some reason
-# automatic isn't working right now, and I don't
-# know why :P)
-files = %w(add init install list remove update help)
-files.each do |file|
-  require_relative "argument_files/#{file}"
-end
+# Require files
+require 'optparse'
+require_relative 'oliver_file_name'
+require_relative 'argument_files/help'
 
-# `argument?` returns help if the
-# specified argument is nonexistant
-def argument?(argument_number)
-  help if ARGV[argument_number].nil?
+def load_file_and_exit(path)
+  require_relative path
+  exit 1
 end
 
-# Different arguments
-# (Make this into a case statement asap)
-# (It'll be way easier and cleaner to work with later)
-def arguments
-  case ARGV[0].downcase
-  when 'install'
-    file_manager
-    install
-  when 'init'
-    file_manager
-    init
-  when 'list'
-    file_manager
-    list
-  when 'update'
-    file_manager
-    update
-  when 'add'
-    file_manager
-    add
-  when 'remove'
-    file_manager
-    remove
-  when 'help'
-    help
-  when '-v' || '--version'
-    puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
-    exit
- else
-    puts "#{Rainbow('Error').underline.red}: Unknown argument: #{ARGV[0]}"
- end
+# Default options
+options = {
+  :verbose => true,
+  :silent  => false,
+  :directory => false
+}
+
+case ARGV[0].downcase
+when 'install'
+  require_relative 'argument_files/install'
+when 'init'
+  require_relative 'argument_files/init'
+when 'list'
+  require_relative 'argument_files/list'
+when 'update'
+  require_relative 'argument_files/update'
+when 'add'
+  require_relative 'argument_files/add'
+when 'remove'
+  require_relative 'argument_files/remove'
+when 'help'
+  help
+when '-v' || '--version'
+  puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
   exit
+else
+  puts "#{Rainbow('Error').underline.red}: Unknown argument: #{ARGV[0]}"
 end

data/lib/oliver/file_manager.rb

@@ -1,10 +1,6 @@
-def file_manager
-  unless ARGV.nil?
-    if File.file? Name::OLIVER
-      body = File.read(Name::OLIVER)
-      $yaml = YAML.load(body)
-    else
-      puts "#{Rainbow(Name::OLIVER).red} does not exist."
-    end
-  end
+if File.file? Name::OLIVER
+  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.7.3'
+  VERSION = '1.8'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.7.3
+  version: '1.8'
 platform: ruby
 authors:
 - Josh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-08 00:00:00.000000000 Z
+date: 2014-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler