oliver 1.5.4.1 → 1.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 977b37fc167692f38e32c3cb816c68fef4f2b601
-  data.tar.gz: fd4ddc47bf557a2994dccb2b3830700ee9c43855
+  metadata.gz: e49525dd2b30b24e54c153b948d8588bcead1b6d
+  data.tar.gz: 8eb689d49bc2bd9bf6979b7e6a8c71a94381e477
 SHA512:
-  metadata.gz: 7b266c44410c9c618b1b1a62a495fec8155ea759ebfd27cb8426dd4266f9516c0cfd074b7e99c34f7a887e295e1f39e34c21ae4aef8c50ac90bad6ca55b2e6bc
-  data.tar.gz: dd32bac98eba1c2732a5519cca1a5f16a69841888dd4f224a93ac46ea4aa16657b29c62f9fd691ae98c4683d15b087b658f228a16af6be9e62f9e53a163d23c0
+  metadata.gz: b641ece129a7e9a78a3b631250849d3b3591edb6d1234d38753b1a5c7c86b345c2b19cf18be733011bcb0d1165b20c6b9777a02c8595db19ab983a5da961a2b4
+  data.tar.gz: d1b6ca1d806980ff236500d2bc359f86e623d9c8eef6d8f24e05eb3c126abe5717987b38cf7194fc8f60dde7746218e98a528ff8f332616fe9bdb1ed895da200

data/Gemfile.lock

@@ -3,12 +3,14 @@ PATH
   specs:
     oliver (1.5.4.1)
       rainbow (>= 2.0.0)
+      require_all (>= 1.3.2)
 
 GEM
   remote: https://rubygems.org/
   specs:
     rainbow (2.0.0)
     rake (10.3.2)
+    require_all (1.3.2)
 
 PLATFORMS
   ruby

data/README.md

@@ -125,6 +125,15 @@ repos:
 # then again, you could just look at the code and determine that yourself
 ```
 
+you can also initialize the repo
+with a folder, if you want to skip a couple
+of steps (things surrounded by '[]' means
+that they're optional)
+
+```bash
+$ olive init [--directory] [directory name (defaulted to 'olives')]
+```
+
 ### install and/or remove listed repos
 
 ```bash
@@ -185,10 +194,12 @@ of the project, `olive` is the name of the CLI.
   is defaulted), just use the full git URL instead of the simple
   `username/repo-name`, for example `git://projects.josh.com/oliver.git`.
 
-<!---
 branches
 ========
 
+(there may or may not be an unstable branch at the moment.
+I'm constantly adding it and deleting it.)
+
 I kept fixing bugs and then I would frantically
 push the fixes because I was worried people, if anyone actually
 uses oliver, would experience problems with it if I didn't push
@@ -201,7 +212,8 @@ anyways, there's an [unstable](https://github.com/trommel/oliver/tree/unstable)
 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.
--->
+
+also, the unstable branch probably won't work.
 
 ideas
 -----

data/lib/oliver/argument_files/add.rb

@@ -0,0 +1,4 @@
+def add
+  argument?(1)
+  puts "added #{Rainbow(ARGV[1]).green} to #{Rainbow('Olivefile').green}."
+end

data/lib/oliver/argument_files/init.rb

@@ -0,0 +1,27 @@
+def init
+
+  if !ARGV[1].nil?
+    if ARGV[2].nil?
+      dir_name = 'olives'
+    else
+      dir_name = ARGV[2]
+    end
+    if ARGV[1].downcase == '--directory'
+      Dir.mkdir dir_name
+      Dir.chdir(dir_name)
+      random_text = Rainbow("Changed directory").blue
+      puts "#{Rainbow(dir_name).green}/ has been created."
+      puts "#{random_text} into #{Rainbow(dir_name).green}/."
+    end
+  end
+
+  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
+  else
+    puts "#{Rainbow(Name::OLIVER).red} already exists."
+  end
+end

data/lib/oliver/argument_files/install.rb

@@ -0,0 +1,68 @@
+def install
+  if !File.file? Name::OLIVER
+    puts "#{Rainbow('Olivefile').red} does not exist."
+    init
+  end
+
+  # Back up your files, man
+  if !File.directory?('.backup')
+    Dir.mkdir '.backup'
+  end
+
+  # The buggiest code in the world
+  # (that's probably totally untrue)
+  body = File.read(Name::OLIVER.chomp)
+  final = YAML.load("---\n#{body}\n---")
+
+  # Fix this ASAP
+  if final["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
+
+  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 '/'
+    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)
+      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
+
+    # 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
+        if !File.directory?(directory_thing)
+          %x(mv #{directory_thing} .backup)
+        else
+          backup_color = Rainbow('.backup/').red
+          repo_color = Rainbow(repo).red
+          puts "There was an error moving #{repo_color}/ to #{backup_color}"
+        end
+      end
+    end
+  end
+end

data/lib/oliver/argument_files/list.rb

@@ -0,0 +1,3 @@
+def list
+  puts "list repos currently in the Olivefile"
+end

data/lib/oliver/argument_files/remove.rb

@@ -0,0 +1,4 @@
+def remove
+  argument?(1)
+  puts "removed #{Rainbow(ARGV[1]).red} from #{Rainbow('Olivefile').green}."
+end

data/lib/oliver/argument_files/update.rb

@@ -0,0 +1,3 @@
+def update
+  puts "pull updates from each tracked repo on the Olivefile"
+end

data/lib/oliver/arguments.rb

@@ -1,44 +1,25 @@
-def argument?(argument_number)
-  help if ARGV[argument_number].nil?
-end
-
-def init
-  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
-  else
-    puts "#{Rainbow(Name::OLIVER).red} already exists."
-  end
-end
-
-def list
-  puts "list repos currently in the Olivefile"
+# 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)
+files.each do |file|
+  require_relative "argument_files/#{file}"
 end
 
-def update
-  puts "pull updates from each tracked repo on the Olivefile"
-end
-
-def add
-  argument?(1)
-  puts "added #{Rainbow(ARGV[1]).green} to #{Rainbow('Olivefile').green}."
-end
-
-def remove
-  argument?(1)
-  puts "removed #{Rainbow(ARGV[1]).red} from #{Rainbow('Olivefile').green}."
+# `argument?` returns help if the
+# specified argument is nonexistant
+def argument?(argument_number)
+  help if ARGV[argument_number].nil?
 end
 
 # Different arguments
 # (Make this into a case statement asap)
 # (It'll be way easier and cleaner to work with later)
-def different_arguments
+def arguments
   case ARGV[0].downcase
   when 'install'
-    run_main
+    install
   when 'init'
     init
   when 'list'

data/lib/oliver/main.rb

@@ -1,70 +1,3 @@
 # Main oliver file
 def run_main
-  if !File.file? Name::OLIVER
-    puts "#{Rainbow('Olivefile').red} does not exist."
-    init
   end
-
-  # Back up your files, man
-  if !File.directory?('.backup')
-    Dir.mkdir '.backup'
-  end
-
-  # The buggiest code in the world
-  # (that's probably totally untrue)
-  body = File.read(Name::OLIVER.chomp)
-  final = YAML.load("---\n#{body}\n---")
-
-  # Fix this ASAP
-  if final["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
-
-  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 '/'
-    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)
-      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
-
-    # 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
-        if !File.directory?(directory_thing)
-          %x(mv #{directory_thing} .backup)
-        else
-          backup_color = Rainbow('.backup/').red
-          repo_color = Rainbow(repo).red
-          puts "There was an error moving #{repo_color}/ to #{backup_color}"
-        end
-      end
-    end
-
-  end
-end

data/lib/oliver/version.rb

@@ -1,3 +1,3 @@
 module Oliver
-  VERSION = "1.5.4.1"
+  VERSION = "1.5.5"
 end

data/lib/oliver.rb

@@ -20,11 +20,8 @@ if ARGV[0].nil?
   exit
 end
 
-# (Literally) different arguments
-different_arguments
+# Arguments
+arguments
 
-# (Literally) other things
-other_things
-
-# just exit
+# just exit at this point
 exit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.5.4.1
+  version: 1.5.5
 platform: ruby
 authors:
 - Josh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-27 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -71,6 +71,12 @@ files:
 - bin/olive
 - bin/oliver
 - lib/oliver.rb
+- lib/oliver/argument_files/add.rb
+- lib/oliver/argument_files/init.rb
+- lib/oliver/argument_files/install.rb
+- lib/oliver/argument_files/list.rb
+- lib/oliver/argument_files/remove.rb
+- lib/oliver/argument_files/update.rb
 - lib/oliver/arguments.rb
 - lib/oliver/help.rb
 - lib/oliver/main.rb