oliver 1.5.4 → 1.5.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da2ecaad510efd0abec8b967399cc325d08fab78
-  data.tar.gz: 8fa51c10f1bb1e56ff2a46b90508686f1507ea16
+  metadata.gz: 977b37fc167692f38e32c3cb816c68fef4f2b601
+  data.tar.gz: fd4ddc47bf557a2994dccb2b3830700ee9c43855
 SHA512:
-  metadata.gz: 570f3c5c3daee5435451f9925281fa13c83c73cede0b36d865e72623a9dcfbded4120145577353f96eeac9f9944252e000b71f3f02f1727d3a5fefca13e0aba7
-  data.tar.gz: db67d9ff6e87210541f5edf4dadcac253f68fef756dfd2662025b11f20321cede08dc3c5e1e6559bc2c35e947265ec95fa679ce2d4ae5ad05b4da9a409ee07b1
+  metadata.gz: 7b266c44410c9c618b1b1a62a495fec8155ea759ebfd27cb8426dd4266f9516c0cfd074b7e99c34f7a887e295e1f39e34c21ae4aef8c50ac90bad6ca55b2e6bc
+  data.tar.gz: dd32bac98eba1c2732a5519cca1a5f16a69841888dd4f224a93ac46ea4aa16657b29c62f9fd691ae98c4683d15b087b658f228a16af6be9e62f9e53a163d23c0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oliver (1.5.3.7)
+    oliver (1.5.4.1)
       rainbow (>= 2.0.0)
 
 GEM

data/lib/oliver/arguments.rb

@@ -1,3 +1,37 @@
+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"
+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}."
+end
+
 # Different arguments
 # (Make this into a case statement asap)
 # (It'll be way easier and cleaner to work with later)
@@ -6,27 +40,17 @@ def different_arguments
   when 'install'
     run_main
   when '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
-    exit
+    init
   when 'list'
-    puts "list repos currently in the Olivefile"
+    list
   when 'update'
-    puts "pull updates from each tracked repo on the Olivefile"
+    update
   when 'add'
-    puts "added #{ARGV[1]} to Olivefile"
+    add
   when 'remove'
-    puts "removed #{ARGV[1]} from Olivefile"
+    remove
   when '-v' || '--version'
     puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
-    exit
   when '-h' || '--help'
    help
  else

data/lib/oliver/main.rb

@@ -1,6 +1,9 @@
 # Main oliver file
 def run_main
-  help if !File.file? Name::OLIVER
+  if !File.file? Name::OLIVER
+    puts "#{Rainbow('Olivefile').red} does not exist."
+    init
+  end
 
   # Back up your files, man
   if !File.directory?('.backup')
@@ -11,7 +14,18 @@ def run_main
   # (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
@@ -42,7 +56,13 @@ def run_main
     # in `Name::OLIVER`, move it to .backup
     current_repos.each do |directory_thing|
       if !listed_repos.to_s.include? directory_thing
-        %x(mv #{directory_thing} .backup)
+        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
 

data/lib/oliver/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.5.4
+  version: 1.5.4.1
 platform: ruby
 authors:
 - Josh