oliver 1.4.2 → 1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7ef0c788dae15608333f6c4b34629c6bc4467c37
-  data.tar.gz: 5d546af001fbd1245e5859326bdd367fce5fd62b
+  metadata.gz: 9381f29437c38b0a0cc32e70d85763c7b4a91a4a
+  data.tar.gz: 9caec5420d4c832441be132ffcd7cce1f659f89b
 SHA512:
-  metadata.gz: a0c3e1eb2b67eb67164279935432273c4bc193f5e3fa7f699e29b67c470b46579c0faee98cb3cbd70ee4b06a94cf631c6fad680bfa70868b8dff40fa36b8e745
-  data.tar.gz: 5859887cf427ae7147f888f7b5367719a9f53e1a71586dfe10a795a0a4d60042821af7f5451d16132c167a1ca720afbcf7726a42ba84e042b7ecf602738a5a8a
+  metadata.gz: 50d0bbc92625e80c98d6a3e20e3ab2050c90c96858491905f360a798547d671dd4b0c9c362badd11aa472ba9d1f67740ae699ba539b69a85a1632a7a1970cb8c
+  data.tar.gz: 14113d28f2e5b8dc638390001364213666951dcf1c7a6374aa4d4b2282fada36ff62329964384cafdec06623344a8e8c8f69264bc760cd6fa7bfba8f65ad8bb8

data/Gemfile.lock

@@ -0,0 +1,21 @@
+PATH
+  remote: .
+  specs:
+    oliver (0.1.7)
+      jibry (>= 0.0.3)
+      rainbow (>= 2.0.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    jibry (0.0.3)
+    rainbow (2.0.0)
+    rake (10.3.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.6)
+  oliver!
+  rake

data/IDEAS.md

@@ -0,0 +1,48 @@
+ideas
+=====
+
+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
+```
+
+- [ ] [Douglas](https://twitter.com/istx25) gave me this cool
+idea that [CocoaPods](https://github.com/CocoaPods/CocoaPods) uses, where
+you can run
+
+```bash
+$ olive install
+```
+
+it can not only install the repos on the list, but remove the repos
+that have been installed locally but are no longer on the list.
+this way, if you want to delete a bunch of repositories, you can simply
+remove them from the list and run
+
+```bash
+$ 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'll add it as soon as I can figure it out.

data/README.md

@@ -141,7 +141,7 @@ repos:
 you can then run
 
 ```bash
-$ olive
+$ olive install # installs / removes listed repos
 ```
 
 ### start tracking a repo
@@ -188,6 +188,12 @@ append `colour=off` to any statement
 
 don't forget to spell *"colour"* **the proper way**.
 
+things to remember
+==================
+
+- run everything with `olive`, not `oliver`. "oliver" is the name
+of the project, `olive` is the name of the CLI.
+
 branches
 ========
 
@@ -204,30 +210,25 @@ branch, if you want to check it out.
 the official gem that's hosted on rubygems, though, is
 the gem of the master branch, and that's how it's going to stay.
 
-things to implement
-===================
-
-[Douglas](https://twitter.com/istx25) gave me this cool
-idea that [CocoaPods](https://github.com/CocoaPods/CocoaPods) uses, where
-when we run
+ideas
+=====
 
-```bash
-$ olive install
-```
+refer to
+[IDEAS.md](https://github.com/trommel/oliver/blob/master/spec/IDEAS.md).
 
-it can not only install the repos on the list, but remove the repos
-that have been installed locally but are no longer on the list.
-this way, if you want to delete a bunch of repositories, you can simply
-remove them from the list and run
+versions
+========
 
-```bash
-$ olive install
-```
+for some reason, I was using things like "1.5" as oliver's
+version for a bit, even though oliver isn't even finished (to
+  even the help menu), so if you check the previous gem versions,
+the newest gem version is probably (maybe) smaller / below
+previous gem versions. this was me being silly and not thinking.
 
-I spent, like, 50 minutes on this and I can't figure out a good way
-to do it, though, so.. yeah
+as of right now (July 18, 2014, 6:19 PM), oliver's version
+is 0.1.5, and it will continue to build off from there.
 
-I'll add it as soon as I can figure it out.
+sorry about doing that silly thing.
 
 testing
 =======

data/bin/oliver

@@ -0,0 +1,6 @@
+#!/usr/bin/env ruby
+require 'rainbow'
+puts Rainbow('Use the "olive" CLI.').red
+puts Rainbow('Run "olive -h" for help.').red
+puts
+require_relative '../lib/oliver'

data/lib/oliver/arguments.rb

@@ -1,18 +1,19 @@
 # Different arguments
+# (Make this into a case statement asap)
+# (It'll be way easier and cleaner to work with later)
 def different_arguments
-  if ! ARGV[0].nil?
-    if ARGV[0].downcase == 'init'
+  if ARGV[0].downcase == 'init'
 
-      if ! File.file?(Name::OLIVER)
-        File.open(Name::OLIVER, 'w') do |file|
-          file.write("repos:\n")
-          file.write("   - \"trommel/oliver\"\n")
-        end
-      else
-        puts "#{Rainbow(Name::OLIVER).red} already exists."
+    if !File.file?(Name::OLIVER)
+      File.open(Name::OLIVER, 'w') do |file|
+        file.write("repos:\n")
+        file.write("   - \"trommel/oliver\"\n")
+        puts "#{Rainbow(Name::OLIVER.green)} has been created."
       end
-
-      Jib.exit
+    else
+      puts "#{Rainbow(Name::OLIVER).red} already exists."
     end
+
+    Jib.exit
   end
 end

data/lib/oliver/main.rb

@@ -1,3 +1,4 @@
+require 'awesome_print'
 # Main oliver file
 def run_main
 
@@ -15,13 +16,26 @@ def run_main
     splitted = url.split '/'
     username = splitted[0]
     repo = splitted[1]
+    current_repos = Dir.entries '.'
+    ['.', '..', '.backup', Name::OLIVER].each do |i|
+      current_repos.delete(i)
+    end
 
     # Clone the repo if it doesn't already exist
     if !File.directory?(repo)
       %x(git clone git://github.com/#{url} --quiet)
+      puts "#{Rainbow(repo).green}/ has been successfully cloned."
     else
       puts "#{Rainbow(repo).red}/ already exists."
     end
 
+    # If the directory doesn't exist
+    # in `Name::OLIVER`, move it to .backup
+    current_repos.each do |directory_thing|
+      if !final["repos"].to_s.include? directory_thing
+        %x(mv #{directory_thing} .backup)
+      end
+    end
+
   end
 end

data/lib/oliver/methods.rb

@@ -1,26 +1,15 @@
-# If the user can't even
-# specify basic arguments
-# just give him/her some help
-# and heavy medication
-def are_you_serious?
-  if ARGV[0].nil?
-    help
-    Jib.exit
-  end
-end
-
 # Help the user with their heavy troubles
 def help
 
   helper = [
     [
-      "install",
-      "clones / removes directories if they're listed on the #{Name::OLIVER}"
+      "init",
+      "initializes the main directory by creating a base #{Name::OLIVER}"
     ],
 
     [
-      "init",
-      "initializes the main directory by creating a base #{Name::OLIVER}"
+      "install",
+      "clones / removes directories if they're listed on the #{Name::OLIVER}"
     ],
 
     [
@@ -41,6 +30,16 @@ def help
     [
       "update",
       "pull updates from each tracked repo on the #{Name::OLIVER}"
+    ],
+
+    [
+      "-v",
+      "return oliver's version"
+    ],
+
+    [
+      "-h",
+      "return this help menu"
     ]
   ]
 
@@ -54,19 +53,19 @@ def help
     puts "#{Rainbow(line).green} # => #{Rainbow(blurb).blue}"
   end
 
+  Jib.exit
+
 end
 
 # Be totally ready if the user asks
 # a question like "what version is oliver?"
 # or "I need some help"
 def other_things
-  are_you_serious?
-  case ARGV[0].to_s.downcase
+  case ARGV[0].downcase
   when '-v' || '--version'
     puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
+    Jib.exit
   when '-h' || '--help'
    help
-  else
-    help
   end
 end

data/lib/oliver/version.rb

@@ -1,3 +1,3 @@
 module Oliver
-  VERSION = "1.4.2"
+  VERSION = "1.5"
 end

data/lib/oliver.rb

@@ -13,6 +13,9 @@ require_relative "oliver/main"
 # 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
   Jib.exit
@@ -21,6 +24,9 @@ end
 # (Literally) different arguments
 different_arguments
 
+# (Literally) other things
+other_things
+
 # if `Name::OLIVER` (string)
 # exists as a file continue with oliver
 if File.file? Name::OLIVER
@@ -28,12 +34,12 @@ if File.file? Name::OLIVER
     run_main
     Jib.exit
   else
-    # name_install = Rainbow('oliver install')
-    # puts "#{name_install} requires an #{Name::OLIVER} to do its magic."
-    help
+    name_install = Rainbow('oliver install').red
+    name_color = Rainbow(Name::OLIVER).red
+    puts "#{name_install} requires an #{name_color} to do its magic."
     Jib.exit
   end
 else
-  other_things
+  help
   Jib.exit
 end

data/oliver.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |gem|
   gem.homepage      = 'https://github.com/trommel/oliver'
 
   gem.files         = `git ls-files`.split($\)
-  gem.executables   = ['olive']
+  gem.executables   = ['olive', 'oliver']
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'oliver'
   gem.require_paths = ['oliver']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.4.2
+  version: '1.5'
 platform: ruby
 authors:
 - Josh
@@ -71,15 +71,19 @@ email:
 - joshception@icloud.com
 executables:
 - olive
+- oliver
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
 - CONTRIBUTING.md
 - Gemfile
+- Gemfile.lock
+- IDEAS.md
 - README.md
 - Rakefile
 - bin/olive
+- bin/oliver
 - lib/oliver.rb
 - lib/oliver/arguments.rb
 - lib/oliver/main.rb