oliver 1.5.3.8 → 1.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 343cc6a19fb36d97ebbde1360658d20d34703277
-  data.tar.gz: 5fdbdfd77b6e1966333e268c5941f25e1e5d2c1e
+  metadata.gz: da2ecaad510efd0abec8b967399cc325d08fab78
+  data.tar.gz: 8fa51c10f1bb1e56ff2a46b90508686f1507ea16
 SHA512:
-  metadata.gz: 10f2869788b0b7e1e3cf61cc6575a76ce5fad6ae1a63c34afda474edfc1c6bd35e114ab1b584a7fbb1ffb39f97c5141fdaa0b02d19564550dcfa663fdb24b4dc
-  data.tar.gz: b5a2a10e46508b1c76d2504ff3a2d1cb84e009fd7b98106f63cea4aacaa083d621e797474b5efea6be9c628e33d393a2e9cf2ac9cc1960b20023475afd1a239f
+  metadata.gz: 570f3c5c3daee5435451f9925281fa13c83c73cede0b36d865e72623a9dcfbded4120145577353f96eeac9f9944252e000b71f3f02f1727d3a5fefca13e0aba7
+  data.tar.gz: db67d9ff6e87210541f5edf4dadcac253f68fef756dfd2662025b11f20321cede08dc3c5e1e6559bc2c35e947265ec95fa679ce2d4ae5ad05b4da9a409ee07b1

data/lib/oliver/arguments.rb

@@ -1,15 +1,10 @@
-def argument?(i)
-  if ARGV[i].nil?
-    help
-    exit
-  end
-end
-
 # Different arguments
 # (Make this into a case statement asap)
 # (It'll be way easier and cleaner to work with later)
 def different_arguments
   case ARGV[0].downcase
+  when 'install'
+    run_main
   when 'init'
     if !File.file?(Name::OLIVER)
       File.open(Name::OLIVER, 'w') do |file|
@@ -26,11 +21,16 @@ def different_arguments
   when 'update'
     puts "pull updates from each tracked repo on the Olivefile"
   when 'add'
-    argument?(1)
     puts "added #{ARGV[1]} to Olivefile"
   when 'remove'
-    argument?(1)
     puts "removed #{ARGV[1]} from Olivefile"
-  end
+  when '-v' || '--version'
+    puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
+    exit
+  when '-h' || '--help'
+   help
+ else
+   help
+ end
   exit
 end

data/lib/oliver/{methods.rb → help.rb}

@@ -56,16 +56,3 @@ def help
   exit
 
 end
-
-# Be totally ready if the user asks
-# a question like "what version is oliver?"
-# or "I need some help"
-def other_things
-  case ARGV[0].downcase
-  when '-v' || '--version'
-    puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
-    exit
-  when '-h' || '--help'
-   help
-  end
-end

data/lib/oliver/main.rb

@@ -1,5 +1,6 @@
 # Main oliver file
 def run_main
+  help if !File.file? Name::OLIVER
 
   # Back up your files, man
   if !File.directory?('.backup')

data/lib/oliver/version.rb

@@ -1,3 +1,3 @@
 module Oliver
-  VERSION = "1.5.3.8"
+  VERSION = "1.5.4"
 end

data/lib/oliver.rb

@@ -5,7 +5,7 @@ require 'YAML'
 require_relative "oliver/oliver_file_name"
 require_relative "oliver/arguments"
 require_relative "oliver/version"
-require_relative "oliver/methods"
+require_relative "oliver/help"
 require_relative "oliver/main"
 
 # if the user doesn't want to use rainbow
@@ -26,17 +26,5 @@ different_arguments
 # (Literally) other things
 other_things
 
-# if `Name::OLIVER` (string)
-# exists as a file continue with oliver
-if File.file? Name::OLIVER
-  if ARGV[0].downcase == 'install'
-    run_main
-    exit
-  else
-    help
-    exit
-  end
-else
-  help
-  exit
-end
+# just exit
+exit

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.5.3.8
+  version: 1.5.4
 platform: ruby
 authors:
 - Josh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -72,8 +72,8 @@ files:
 - bin/oliver
 - lib/oliver.rb
 - lib/oliver/arguments.rb
+- lib/oliver/help.rb
 - lib/oliver/main.rb
-- lib/oliver/methods.rb
 - lib/oliver/oliver_file_name.rb
 - lib/oliver/version.rb
 - oliver.gemspec