oliver 1.5.5.4 → 1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0da3f48fc45c3de9ac3dcfcde1422c03def26b49
-  data.tar.gz: 7429404cf832f5c19c7bf549c81ca74368b7eef0
+  metadata.gz: 4af3688c06c34ba541101275bb794e4d8f1b7ee8
+  data.tar.gz: 94916f75e4089d6c0e6ed0ca62c9f7ea4d6ab4ec
 SHA512:
-  metadata.gz: 545b4a58c8e305032e18f1f914510630a33c572bb9889e9b34a48938ac2cc60cb4c33acb517ec54aef03d0f4aed0beb0adda9349a7b8fd5ecb357575f4a3d01e
-  data.tar.gz: 4e7819be1707880c01a1b0a121cac61f01d0b7dcca85bc62ac38d9b0e54469e675c65478182e0c0e8866619b795697477ce5424fef86592ec75a19f23d2c4b0f
+  metadata.gz: ffe7cfa88565830732dbef384f9a065279b86976784e9d6fb18641f5293929fd5b08ca90a1b8f0324702e7f36f85f3baf75d18b03a7387dd1a14532c3bce19f0
+  data.tar.gz: 441ad35e2ae3e18a51b4817920f4761bb684eafe1f90dd169fb525ab45a544d8c1c93e03c3dd95c657cfc57dba0c2df46808e7fcae4338718ae23c428ee5b53a

data/Gemfile

@@ -1,4 +1,4 @@
 source 'https://rubygems.org'
 
-# Specify your gem's dependencies in ramona.gemspec
+# Specify your gem's dependencies in oliver.gemspec
 gemspec

data/README.md

@@ -194,6 +194,13 @@ 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`.
 
+- arguments after the actual arguments will be ignored, i.e.:
+
+```bash
+# everything after -d will be ignored
+$ olive init -d hey here are more arguments
+```
+
 branches
 ========
 
@@ -213,13 +220,22 @@ 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.
+also, the unstable branch probably maybe won't work.
+
+there also might be a "clean" branch, which is basically a (possibly) outdated
+version of oliver that'll backup your directories when you run `olive install`
+(if the repo isn't on the list of repos to track). the master branch
+is now considered "unsafe", meaning that it will simply delete the repo
+if it's not on the list when `olive install` is run.
+
+this is probably maybe a bad idea, but it's a lot easier to maintain.
+if you don't like this, fix it, and make it work properly :)
 
 ideas
 -----
 
 refer to
-[IDEAS.md](https://github.com/trommel/oliver/blob/master/spec/IDEAS.md).
+[IDEAS.md](https://github.com/trommel/oliver/blob/master/LICENSE).
 
 versions
 --------

data/lib/oliver/argument_files/init.rb

@@ -16,7 +16,7 @@ def init
     File.open(Name::OLIVER, 'w') do |file|
       file.write("repos:\n")
       file.write("   - \"trommel/oliver\"\n")
-      puts "#{Rainbow(Name::OLIVER).green} has been created."
+      puts "#{Rainbow(dir_name).green}/#{Rainbow(Name::OLIVER).green} has been created."
     end
   else
     puts "#{Rainbow(Name::OLIVER).red} already exists."

data/lib/oliver/argument_files/install.rb

@@ -1,20 +1,11 @@
 def install
-  unless File.file? Name::OLIVER
-    puts "#{Rainbow('Olivefile').red} does not exist."
-    init
-  end
 
   # Back up your files, man
-  backup_directory_name = '.backup'
-  Dir.mkdir backup_directory_name unless File.directory? backup_directory_name
-
-  # The buggiest code in the world
-  # (that's probably totally untrue)
-  body = File.read(Name::OLIVER.chomp)
-  final = YAML.load("---\n#{body}\n---")
+  # backup_directory_name = '.backup'
+  # Dir.mkdir backup_directory_name unless File.directory? backup_directory_name
 
   # Fix this ASAP
-  if final['repos'].nil?
+  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."
@@ -24,10 +15,10 @@ Try adding something to the list for the time being."
 
   listed_repos = []
 
-  final['repos'].each do |what|
+  $final['repos'].each do |what|
     listed_repos.push(what)
   end
-  final['repos'].each do |url|
+  $final['repos'].each do |url|
 
     # Split the url in half
     splitted = url.split '/'
@@ -54,11 +45,12 @@ Try adding something to the list for the time being."
     current_repos.each do |directory_thing|
       if !listed_repos.to_s.include?(directory_thing) &&
                           File.directory?(directory_thing)
-        `mv #{directory_thing} .backup`
+        `yes | rm -r #{directory_thing}`
+        # `mv #{directory_thing} .backup`
       else
-        backup_color = Rainbow('.backup/').red
+        backup_color = Rainbow('.backup').red
         repo_color = Rainbow(repo).red
-        puts "There was an error moving #{repo_color}/ to #{backup_color}"
+        puts "There was an error moving #{repo_color}/ to #{backup_color}/"
       end
     end
   end

data/lib/oliver/argument_files/list.rb

@@ -1,3 +1,30 @@
+# For later (possible) Hash implementation
+# def list
+#   listed_repos = []
+#   # todo: if user has multiple repos,
+#   # have one user key with an array of
+#   # the user's repos
+#   $final['repos'].each do |thing|
+#     new_thing = thing.split('/')
+#     listed_repos.push(new_thing)
+#   end
+#   puts listed_repos.to_h
+# end
+
+# Simple enough :P
 def list
-  puts 'todo: list repos currently in the Olivefile'
+  counter = 0
+  $final['repos'].each do |thing|
+    repo = thing.split('/')[1] # might as well discard the username
+    if File.directory?(repo)
+      print Rainbow(repo).green
+    else
+      print Rainbow(repo).red
+    end
+    if counter % 4 == 0
+      print "\t"
+    end
+    counter =+ 1
+  end
+  puts
 end

data/lib/oliver/arguments.rb

@@ -19,16 +19,22 @@ end
 def arguments
   case ARGV[0].downcase
   when 'install'
+    file_manager
     install
   when 'init'
+    file_manager
     init
   when 'list'
+    file_manager
     list
   when 'update'
+    file_manager
     update
   when 'add'
+    file_manager
     add
   when 'remove'
+    file_manager
     remove
   when 'help'
     help
@@ -36,7 +42,7 @@ def arguments
     puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
     exit
  else
-    help
+    puts "#{Rainbow('Error').underline.red}: Unknown argument: #{ARGV[0]}"
  end
   exit
 end

data/lib/oliver/file_manager.rb

@@ -0,0 +1,10 @@
+def file_manager
+  unless ARGV.nil?
+    if File.file? Name::OLIVER
+      body = File.read(Name::OLIVER.chomp)
+      $final = YAML.load("---\n#{body}\n---")
+    else
+      puts "#{Rainbow(Name::OLIVER).red} does not exist."
+    end
+  end
+end

data/lib/oliver/version.rb

@@ -1,5 +1,5 @@
 # The main module for
 # Oliver's version
 module Oliver
-  VERSION = '1.5.5.4'
+  VERSION = '1.6'
 end

data/lib/oliver.rb

@@ -2,7 +2,7 @@
 # twss
 require 'rainbow'
 require 'YAML'
-%w(oliver_file_name arguments version main).each do |file|
+%w(oliver_file_name file_manager arguments version main).each do |file|
   require_relative "oliver/#{file}"
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.5.5.4
+  version: '1.6'
 platform: ruby
 authors:
 - Josh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-01 00:00:00.000000000 Z
+date: 2014-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -79,6 +79,7 @@ files:
 - lib/oliver/argument_files/remove.rb
 - lib/oliver/argument_files/update.rb
 - lib/oliver/arguments.rb
+- lib/oliver/file_manager.rb
 - lib/oliver/main.rb
 - lib/oliver/oliver_file_name.rb
 - lib/oliver/version.rb