oliver 1.8.9.7 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d712fbac0d440ce68a25827e22433c32637ccdf3
-  data.tar.gz: f5579ba2993b54e779624590458c84a2033eecb8
+  metadata.gz: 62310d3009d7a1fc2737c23f862a10d414e231fc
+  data.tar.gz: 3402e843e55371c10234c02a4509c10ba45a4989
 SHA512:
-  metadata.gz: beddc08fef0effee882090eb5eb6d4030d9054b6ab51f3b3a284b014c2a012922e34328aeca516c2bf443f935aee6730d10c05dc22fbb6556c43c860db4cc0f4
-  data.tar.gz: 6d73b5844c127ee0febb1e21bdcde2a993d33b559ec92bf8be34db4f7674ae8e229862dc44425ccebac4060aec0bb111d1c0d4125b2638dcdc49a016754ef212
+  metadata.gz: feca6d846c2f4145d64d7938898f673b65cf7730f415ea6aaace2bbffe461135e1f358d6feca8a6821530b4d0c29b7ecef62d4804fe9bca496fc8370ef6ee65a
+  data.tar.gz: 17135d494ae3e0d00a8481b5000136291cd433cb9b5b48199f123930938a07e31b578ea09cf544a4d7825882f742a1f76c620f52dddffcbef9f1d02667b40d64

data/IDEAS.md

@@ -5,25 +5,7 @@ ideas that should or have already been implemented.
 
 - [x] ~~make the backup directory hidden (`.backup`)~~
 
-- [ ] add verbose mode (`--verbose`) so things like `olive install` will have output like
-
-```bash
-olive/ already exists.
-dotfiles was cloned.
-```
-
-etc, etc. otherwise, this should be defaulted to silent.
-
-this should also be able to be set through the Olivefile
-
-```bash
-repos:
-   - "trommel/oliver"
-
-prefs:
-   - "verbose"
-   - "no colour" # this too :P
-```
+- [x] add silent mode (`--silent`) so commands will hide output
 
 - [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)

data/README.md

@@ -3,11 +3,8 @@ oliver
 
 [![Gem Version](https://badge.fury.io/rb/oliver.svg)](http://badge.fury.io/rb/oliver)
 
-oliver manages your local GitHub projects
-in a simple YAML file.
-
-> "Like podfiles for Git repos."
--- [@istx25](https://github.com/istx25)
+oliver manages your local GitHub projects in one simple file. It's like
+[CocoaPod's](http://cocoapods.org/) "podfiles", but for your Git repos.
 
 Installation
 ------------
@@ -23,45 +20,44 @@ Documentation
 
 ### Example
 
-Create the base `.Olivefile.yml`
+Create the base `.oliver`
 
 ```bash
 $ cd projects
 $ olive init
-$ $EDITOR .Olivefile.yml
+$ $EDITOR .oliver
 ```
-and then add whatever you'd like to the
-YAML file
-
-```yaml
----
-repos:
-  trommel:
-    - "oliver"
-    - "textymous"
-  istx25:
-    - "Fluorescent"
-    - "dotfiles"
-  misc:
-    - "git://github.com/trommel/calkoolator"
----
+and then add whatever you'd like to the file (write in JSON)
+
+```json
+{
+	"repos": {
+		"trommel": [
+			"oliver",
+			"textymous"
+		],
+		"istx25": [
+			"Fluorescent",
+			"dotfiles"
+		],
+		"misc": [
+			"https://exampleserver.com/repo"
+		]
+	}
+}
 ```
 
-- Remember to use spaces for indentation, not tabs.
-- `Misc` is preferred syntax for use
-when there's only one repo by an author in
-your YAML file. With `Misc`, use the full URL
-(for support with non-GitHub repos)
+- Use `Misc` for URLs that aren't hosted on GitHub
 
 ### Initializing the root
 
 ```bash
-$ olive init [-d|--directory] [directory name (defaulted to 'olives')]
+$ olive init
 ```
 
-### Clones/Remove repos based on YAML file
+### Clones/Remove repos based on `.olive`
 
-Clones repos listed in the YAML file and
+Clones repos listedy and
 removes ones saved locally that aren't found
 in the file
 
@@ -77,6 +73,10 @@ List all of the repos that are being tracked
 $ olive list
 ```
 
+The + (plus sign) next to the repo shows that it'll be cloned on the next
+`olive install`. The # (pound sign) next to the repo
+means it'll remain unaffected.
+
 ### Update (`git pull`) each repo
 
 Essentially run `git pull` in each
@@ -86,49 +86,22 @@ individual repo
 $ olive update
 ```
 
-Notes
------
-
-- Arguments after the actual arguments will be ignored, for example:
-
-```bash
-# everything after "repo_name" will be ignored
-$ olive init -d repo_name here are more arguments
-```
-
-Extras
-------
-
-oliver uses [rainbow](https://github.com/sickill/rainbow), a gem for colouring the Terminal prompt.
-If you want to use it, just prepend `colour=on` to any olive command.
-
-If you want to enable it by default you can make a `.settings.yml` file in
-your directory and add some settings to it:
-
-```YAML
----
-colour: "on"
----
-```
-
 To-Do
 -----
 
 - [x] Remake the help/info thing to be slimmer & look better
-- [ ] Expand support to any Git, not just GitHub (why didn't I do this earlier?)
-- [ ] Fix bugs with..
-    - [ ] `update` (tons)
-    - [ ] `install` (not as many)
-    - [ ] `list` (hardly any, I think)
+- [x] Expand repo support to Git in general, not just GitHub
+- [ ] Add support to `olive list` so that it'll list repos that're already cloned but not on the list (so the user knows that it's being removed on the next `olive install`)
+- [ ] Clean up the mess that is [`commands.rb`](https://github.com/trommel/oliver/blob/cleanup/lib/oliver/commands.rb)
 
 Ideas
 -----
-Refer to [ideas.md](https://github.com/trommel/oliver/blob/master/IDEAS.md).
+Refer to [ideas.md](IDEAS.md).
 
 Contribution
 ------------
-Refer to [contribution.md](https://github.com/trommel/oliver/blob/master/spec/CONTRIBUTING.md).
+Refer to [contribution.md](CONTRIBUTING.md).
 
 Licensing
 ---------
-Refer to [LICENSE](https://github.com/trommel/oliver/blob/master/spec/LICENSE).
+Refer to [LICENSE](LICENSE).

data/bin/olive

@@ -1,2 +1,7 @@
 #!/usr/bin/env ruby
-require_relative '../lib/oliver'
+
+lib = File.expand_path(File.dirname(__FILE__) + '/../lib')
+$LOAD_PATH.unshift(lib) if File.directory?(lib) && !$LOAD_PATH.include?(lib)
+
+require 'oliver'
+Oliver.run(*ARGV.map(&:downcase))

data/bin/oliver

@@ -1,5 +1,2 @@
 #!/usr/bin/env ruby
-require 'rainbow'
-puts Rainbow('Use the "olive" CLI, it\'s cleaner.').red
-puts
-require_relative '../lib/oliver'
+puts "Use the 'olive' binary"

data/community/iOS-external-libraries-istx25.yml

@@ -1,72 +1,74 @@
----
-repos:
-  samvermette:
-    - "UIAlertView-Blocks"
-    - "Montreal-Collective"
-    - "SVSegmentedControl"
-    - "iOS-Simulator-Raindrop"
-    - "RaptureXML"
-    - "emphasize.js"
-    - "objc-geohash"
-    - "SVStatusHUD"
-
-  gcamp:
-    - "services-to-omnifocus"
-    - "OpenTripPlanner"
-    - "github-omnifocus-sync"
-
-  TransitApp:
-    - "SVProgressHUD"
-    - "SVHTTPRequest"
-    - "SVWebViewController"
-
-  misc:
-    - "stefanceriu/SCSiriWaveformView"
-    - "KjulyKYCircleMenu"
-    - "chillok/AnimatedCircularCollectionMenu"
-    - "YoApp/hey"
-    - "opentripplanner/OpenTripPlanner"
-    - "ghvillasboas/CloudKitTest"
-    - "lovell/sharp"
-    - "davidluzgouveia/ParallaxScrolling"
-    - "ellisonleao/magictools"
-    - "buger/gor"
-    - "OpenRA/OpenRA"
-    - "cocos2d/cocos2d-x"
-    - "AdamsLair/duality"
-    - "quicksilver/Quicksilver"
-    - "muan/github-gmail"
-    - "AgileBits/onepassword-app-extension"
-    - "snowshoestamp/python_sdk"
-    - "abraham/twitteroauth"
-    - "rs/SDWebImage"
-    - "maddox/regexkit"
-    - "tonymillion/Reachability"
-    - "ole/OBGradientView"
-    - "stig/json-framework"
-    - "flori/json"
-    - "crino/instagram-ios-sdk"
-    - "dalexsoto/HardwareInfo"
-    - "nicklockwood/FXPageControl"
-    - "fhsjaagshs/FHSTwitterEngine"
-    - "enormego/EGOTableViewPullRefresh"
-    - "Darktt/DTAlertView"
-    - "kriskowal/transcode"
-    - "pokeb/asi-http-request"
-    - "Cue/CueTableReloader"
-    - "AFNetworking/AFNetworking"
-    - "yashigani/YSViewer"
-    - "nicklockwood/SwipeView"
-    - "CEWendel/SWTableViewCell"
-    - "stefanoa/SASlideMenu"
-    - "datwelk/RDRStickyKeyboardView"
-    - "MacMannes/MKInfoPanel"
-    - "jdg/MBProgressHUD"
-    - "JLZ/JZSwipeCell"
-    - "autresphere/ASDepthModal"
-    - "marshluca/PolylineDemo"
-    - "wit-ai/wit-ios-sdk"
-    - "koenbok/Framer"
-    - "mattdonnelly/Swifter"
-    - "cloudapp/api"
----
+{
+  "repos": {
+    "samvermette": [
+      "UIAlertView-Blocks",
+      "Montreal-Collective",
+      "SVSegmentedControl",
+      "iOS-Simulator-Raindrop",
+      "RaptureXML",
+      "emphasize.js",
+      "objc-geohash",
+      "SVStatusHUD"
+    ],
+    "gcamp": [
+      "services-to-omnifocus",
+      "OpenTripPlanner",
+      "github-omnifocus-sync"
+    ],
+    "TransitApp": [
+      "SVProgressHUD",
+      "SVHTTPRequest",
+      "SVWebViewController"
+    ],
+    "misc": [
+      "stefanceriu/SCSiriWaveformView",
+      "KjulyKYCircleMenu",
+      "chillok/AnimatedCircularCollectionMenu",
+      "YoApp/hey",
+      "opentripplanner/OpenTripPlanner",
+      "ghvillasboas/CloudKitTest",
+      "lovell/sharp",
+      "davidluzgouveia/ParallaxScrolling",
+      "ellisonleao/magictools",
+      "buger/gor",
+      "OpenRA/OpenRA",
+      "cocos2d/cocos2d-x",
+      "AdamsLair/duality",
+      "quicksilver/Quicksilver",
+      "muan/github-gmail",
+      "AgileBits/onepassword-app-extension",
+      "snowshoestamp/python_sdk",
+      "abraham/twitteroauth",
+      "rs/SDWebImage",
+      "maddox/regexkit",
+      "tonymillion/Reachability",
+      "ole/OBGradientView",
+      "stig/json-framework",
+      "flori/json",
+      "crino/instagram-ios-sdk",
+      "dalexsoto/HardwareInfo",
+      "nicklockwood/FXPageControl",
+      "fhsjaagshs/FHSTwitterEngine",
+      "enormego/EGOTableViewPullRefresh",
+      "Darktt/DTAlertView",
+      "kriskowal/transcode",
+      "pokeb/asi-http-request",
+      "Cue/CueTableReloader",
+      "AFNetworking/AFNetworking",
+      "yashigani/YSViewer",
+      "nicklockwood/SwipeView",
+      "CEWendel/SWTableViewCell",
+      "stefanoa/SASlideMenu",
+      "datwelk/RDRStickyKeyboardView",
+      "MacMannes/MKInfoPanel",
+      "jdg/MBProgressHUD",
+      "JLZ/JZSwipeCell",
+      "autresphere/ASDepthModal",
+      "marshluca/PolylineDemo",
+      "wit-ai/wit-ios-sdk",
+      "koenbok/Framer",
+      "mattdonnelly/Swifter",
+      "cloudapp/api"
+    ]
+  }
+}

data/lib/oliver/commands.rb

@@ -0,0 +1,105 @@
+require 'json'
+require 'git'
+require 'fileutils'
+require_relative 'file_name'
+require_relative 'file_manager'
+
+# Main commands
+module Oliver
+  module_function
+
+  def init(options)
+    options = options[:options]
+    unless File.exists?(Oliver::NAME)
+      File.open(Oliver::NAME, 'w') do |file|
+        tempHash = { repos: { trommel: ["oliver"] } }
+        file.write(JSON.pretty_generate(tempHash))
+        puts "#{Oliver::NAME} created sucessfully" if options[:verbose]
+      end
+    end
+  end
+
+  # I'm honestly ashamed of this piece of shit, it's hack as fuck
+  def install(options)
+    options = options[:options] # DRY
+    unless FileManager::BODY.nil?
+      FileManager::BODY['repos'].map do |user, repos|
+        user  ||= ''
+        repos ||= []
+
+        # Add options[:verbose] support as soon as this doesn't look awful
+        unless user.empty? || repos.nil?
+          repos.each do |repo|
+            if File.directory?(repo)
+              puts "Warning: #{repo}/ already exists"
+            else
+              if user.downcase == 'misc'
+                cloned_repo = Git.clone(repo, repo.split('/').last, :path => '.')
+              else
+                cloned_repo = Git.clone(
+                      "https://github.com/#{user}/#{repo}",
+                      repo,
+                      :path => '.'
+                  )
+              end
+              if File.directory?(repo) || File.directory?(repo.split('/').last)
+                puts "Success: #{repo}/ has been cloned"
+              else
+                puts "Warning: #{repo}/ failed to clone"
+              end
+            end
+          end
+        end
+      end
+
+      dirRepos = Dir.entries('.').reject do |f|
+        f['.'] || f['..'] || f[Oliver::NAME]
+      end
+      dirRepos.sort!
+
+      trackedRepos = FileManager::BODY['repos'].map do |user, repos|
+        repos.select { |repo| repo }
+      end
+      trackedRepos.sort!
+      trackedRepos = trackedRepos.first
+
+      unless dirRepos == trackedRepos
+        dirRepos ||= []
+        trackedRepos ||= []
+        dirRepos -= trackedRepos
+        unless dirRepos.empty?
+          dirRepos.each do |dirRepo|
+            print "Warning: Enter '#{dirRepo}' to locally delete the repo: "
+            FileUtils.rm_rf(dirRepo) if STDIN.gets.chomp.downcase == dirRepo
+          end
+        end
+      end
+    end
+  end
+
+  def list
+    FileManager::BODY["repos"].map do |user, repos|
+      repos ||= []
+      # Add silent shit later when it's actually working
+      unless repos.empty?
+        repos.each do |repo|
+          if File.directory?(repo) then print '# ' else print '+ ' end # bugs
+          puts repo
+        end
+      end
+    end
+  end
+
+  # Still buggy, afaik
+  def update(options)
+    options = options[:options] # DRY
+    dirs = Dir.glob('*').select { |f| File.directory? f }
+    dirs.each do |dir|
+      Dir.chdir(dir)
+      g = Git.open(Dir.pwd)
+      pull = g.pull
+      puts "#{dir}/ has been updated" unless pull.include? 'Already up-to-date'
+      Dir.chdir('..')
+    end
+  end
+end

data/lib/oliver/file_manager.rb

@@ -1,11 +1,18 @@
-require 'yaml'
+require 'json'
+
+# Reads and parses the .olive file
 module FileManager
-  if File.file? Name::OLIVER
-    body = File.read(Name::OLIVER)
-    YAML = YAML.load(body)
+  if File.file?(Oliver::NAME)
+    body = File.read(Oliver::NAME)
+    BODY = JSON.parse(body)
   else
+<<<<<<< HEAD
     puts "#{Rainbow(Name::OLIVER).red} does not exist."
     YAML = nil
     exit
+=======
+    puts "#{Oliver::NAME} does not exist."
+    BODY = nil
+>>>>>>> cleanup
   end
 end

data/lib/oliver/file_name.rb

@@ -0,0 +1,4 @@
+# Oliver's file name that the user edits
+module Oliver
+  NAME = '.oliver'
+end

data/lib/oliver/hash.rb

@@ -0,0 +1,10 @@
+# Add a method to hash for easier conversion of keys to string
+class Hash
+  def keys_to_s
+    commands = keys.to_s
+    commands.tr!(':', '')
+    commands.tr!('[', '')
+    commands.tr!(']', '')
+    commands.split(', ')
+  end
+end

data/lib/oliver/settings.rb

@@ -1,8 +1,9 @@
+require 'yaml'
+
 # Load .settings.yml to get user settings set to default
 # For example, if the user specifies colour=on, do that by default
 # Make this short and concise if possible
 
-require 'yaml'
 module SettingsManager
   settingsName = '.settings.yml'
   if File.file? settingsName

data/lib/oliver/version.rb

@@ -1,5 +1,4 @@
-# The main module for
 # Oliver's version
 module Oliver
-  VERSION = '1.8.9.7'
+  VERSION = '2.0'
 end

data/lib/oliver.rb

@@ -1,5 +1,85 @@
-# Require files
-require 'rainbow'
+require_relative 'oliver/hash'
+require_relative 'oliver/version'
 
-# Arguments
-require_relative 'oliver/arguments'
+# Main Oliver module
+module Oliver
+  module_function
+
+  def command
+    @command ||= ''
+  end
+
+  def run(*args)
+    if args.empty?
+      advice
+    else
+      process args
+    end
+  end
+
+  def process(*args)
+    # Address 'passing through methods' issues (nesting arrays)
+    args = args.first
+
+    # Store commands
+    @command = ''
+
+    # Get strings of keys of commands
+    basicCommands = advice(silent:true).keys_to_s
+
+    # Command-line arguments
+    @options = { verbose: true }
+
+    # Option parsing, essentially
+    until args.empty?
+      case arg = args.shift
+      when '--silent' then @options[:verbose] = false
+      when '--directory' then @options[:directory] = true
+      when 'version', '--version' then puts "oliver v#{Oliver::VERSION}"
+      when 'help', '--help' then assist
+      when *basicCommands
+        @command << arg + ' '
+      else
+        puts "Unknown command: #{arg}"
+        advice
+        # exit
+      end
+    end
+
+    # Build the command and do what you must
+    build @command unless @command.empty?
+  end
+
+  def advice(info={}) # since help is a Ruby keyword
+    advice = {
+      init:    'initializes the main directory by creating a base dotfile',
+      install: 'clones/removes repos if they\'re listed',
+      list:    'list user repos',
+      update:  'pull updates from each tracked repo',
+      version: 'return the current version',
+      help:    'return this help menu'
+    }
+
+    unless info[:silent]
+      puts 'usage: olive [command] [arguments]'
+      advice.map { |key, value| puts "#{key}    \t#{value}" }
+    end
+
+     advice # return advice
+  end
+
+  def build(commands)
+    require_relative 'oliver/commands'
+    @command = @command.split(' ')
+    case @command.first
+    when 'init'
+      init(options:@options)
+    when 'install'
+      install(optoins:@options)
+    when 'list'
+      list
+    when 'update'
+      update(optoins:@options)
+    else end
+  end
+end

data/oliver.gemspec

@@ -2,10 +2,10 @@
 require File.expand_path('../lib/oliver/version', __FILE__)
 
 Gem::Specification.new do |gem|
-  gem.authors       = ['Josh']
-  gem.email         = ['joshception@icloud.com']
+  gem.authors       = ['Josh Trommel']
+  gem.email         = ['joshtrommel@gmail.com']
   gem.description   = 'Local Git(Hub) made easy.'
-  gem.summary       = 'Manage your Git(Hub) repos / projects easier.'
+  gem.summary       = 'Manage your Git(Hub) repos/projects easier.'
   gem.homepage      = 'https://github.com/trommel/oliver'
 
   gem.files         = `git ls-files`.split($ORS)
@@ -16,7 +16,7 @@ Gem::Specification.new do |gem|
   gem.version       = Oliver::VERSION
 
   gem.add_development_dependency 'bundler', '~> 1.6'
-  gem.add_development_dependency 'rake'
-  gem.add_dependency 'rainbow', '~> 2.0', '>= 2.0.0'
-  gem.add_dependency 'git', '~> 1.2', '>= 1.2.8'
+  gem.add_development_dependency 'rake', '~> 0'
+  gem.add_dependency 'git', '~> 1.2.9', '>= 1.2.8'
+  gem.add_dependency 'json', '~> 1.8.2', '>= 1.8.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.8.9.7
+  version: '2.0'
 platform: ruby
 authors:
-- Josh
+- Josh Trommel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-30 00:00:00.000000000 Z
+date: 2015-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -28,59 +28,59 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rainbow
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.2.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.2.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: 1.2.9
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.0
+        version: 1.2.8
 - !ruby/object:Gem::Dependency
-  name: git
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.8.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.2'
+        version: 1.8.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.2.8
+        version: 1.8.0
 description: Local Git(Hub) made easy.
 email:
-- joshception@icloud.com
+- joshtrommel@gmail.com
 executables:
 - olive
 - oliver
@@ -99,14 +99,10 @@ files:
 - community/README.md
 - community/iOS-external-libraries-istx25.yml
 - lib/oliver.rb
-- lib/oliver/argument_files/help.rb
-- lib/oliver/argument_files/init.rb
-- lib/oliver/argument_files/install.rb
-- lib/oliver/argument_files/list.rb
-- lib/oliver/argument_files/update.rb
-- lib/oliver/arguments.rb
+- lib/oliver/commands.rb
 - lib/oliver/file_manager.rb
-- lib/oliver/oliver_file_name.rb
+- lib/oliver/file_name.rb
+- lib/oliver/hash.rb
 - lib/oliver/settings.rb
 - lib/oliver/version.rb
 - oliver.gemspec
@@ -129,8 +125,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
-summary: Manage your Git(Hub) repos / projects easier.
+summary: Manage your Git(Hub) repos/projects easier.
 test_files: []

data/lib/oliver/argument_files/help.rb

@@ -1,43 +0,0 @@
-require_relative '../oliver_file_name'
-# Help the user with their heavy troubles
-helper = [
-  [
-    'init',
-    "initializes the main directory by creating a base dotfile"
-  ],
-
-  [
-    'install',
-    "clones/removes repos if they're listed"
-  ],
-
-  [
-    'list',
-    "list repos currently on #{Name::OLIVER}"
-  ],
-
-  [
-    'update',
-    "pull updates from each tracked repo"
-  ],
-
-  [
-    '-v',
-    'return oliver\'s version'
-  ],
-
-  [
-    '-h',
-    'return this help menu'
-  ]
-]
-
-top_message = 'oliver - help / usage'
-
-puts Rainbow(top_message).red
-(top_message.length + 1).times { print Rainbow('=').yellow }
-puts
-
-helper.map do |line, blurb|
-  puts "#{Rainbow(line).green} # => #{Rainbow(blurb).blue}"
-end

data/lib/oliver/argument_files/init.rb

@@ -1,31 +0,0 @@
-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
-      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."
-end

data/lib/oliver/argument_files/install.rb

@@ -1,94 +0,0 @@
-require_relative '../file_manager'
-require 'fileutils'
-require 'git'
-
-# Success, warning and error messages
-# (Make these public, sometime)
-success = "#{Rainbow('Success').underline.green}:"
-warning = "#{Rainbow('Warning').underline.yellow}:"
-error = "#{Rainbow('Error').underline.red}:"
-
-# Fix this ASAP
-if FileManager::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
-
-# Create the empty listed_repos array for later
-listed_repos = []
-
-# Map out the username and repos(array)
-FileManager::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
-    if username.downcase == 'misc'
-      split = repo.split('/')
-      last_of_url = split.last
-      if !File.directory?(last_of_url)
-        repo_replaced = last_of_url.gsub('/', '-')
-        cloned_repo = Git.clone(
-                      repo,
-                      repo_replaced,
-                      :path => '.'
-                      )
-        if File.directory?(repo_replaced)
-          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
-      cloned_repo = Git.clone("
-                      git://github.com/#{username}/#{repo}",
-                      repo,
-                      :path => '.'
-                      )
-			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} Enter '#{directory}' to locally delete the repo: "
-    FileUtils.rm_rf(directory) if STDIN.gets.chomp.downcase == directory
-  end
-end

data/lib/oliver/argument_files/list.rb

@@ -1,28 +0,0 @@
-require_relative '../file_manager'
-
-# counter = 0
-begin
-  FileManager::YAML['repos'].map do |username, repos|
-    if repos.nil?
-      puts "#{Rainbow('Error').red.underline}: Your repos look a little nil."
-      exit
-    end
-    repos.each do |repo|
-      if File.directory?(repo)
-        if Rainbow.enabled
-          puts Rainbow(repo).green
-        else
-          puts Rainbow("+ #{repo}").green
-        end
-      else
-        if Rainbow.enabled
-          puts Rainbow(repo).red
-        else
-          puts Rainbow("- #{repo}").red
-        end
-      end
-      # print "\t" if counter % 4 == 0
-      # counter += 1
-    end
-  end
-end

data/lib/oliver/argument_files/update.rb

@@ -1,11 +0,0 @@
-require_relative '../oliver_file_name'
-require 'git'
-dirs = Dir.glob('*').select { |f| File.directory? f }
-puts 'theoretically this should work but there will be tons of bugs' # enjoy!!
-dirs.each do |dir|
-  Dir.chdir(dir)
-  g = Git.open(Dir.pwd)
-  pull = g.pull
-  puts "#{dir}/ has been updated." if !pull.include? 'Already up-to-date'
-  Dir.chdir('..')
-end

data/lib/oliver/arguments.rb

@@ -1,48 +0,0 @@
-# Require files
-require_relative 'oliver_file_name'
-require_relative 'version'
-
-def help
-  require_relative 'argument_files/help'
-end
-
-# Default options
-options = {
-  :verbose   => true,
-  :silent    => false,
-  :directory => false,
-  :colour    => ARGV[-1] == 'colour=on'
-}
-
-# Enable/Disable Rainbow
-Rainbow.enabled = options[:colour]
-
-# Check .settings.yml
-require_relative 'settings'
-
-# Help if user doesn't specify proper arguments
-if ARGV.empty? || ARGV[0] == 'colour=on'
-  help
-else
-  # Case for arguments
-  case ARGV[0].downcase
-  when 'colour=on'
-    help
-    exit
-  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 '-h', '--help', 'help'
-    help
-  when '-v', '--version', 'version'
-    puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
-    exit
-  else
-    puts "#{Rainbow('Error').underline.red}: Unknown argument: #{ARGV[0]}"
-  end
-end

data/lib/oliver/oliver_file_name.rb

@@ -1,5 +0,0 @@
-# The main module for whatever [you]
-# want the main (YAML) file to be called
-module Name
-  OLIVER = '.Olivefile.yml'
-end