oliver 1.5.5.2 → 1.5.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3687471fd017dec51585702807f53b02cbc290e5
-  data.tar.gz: 5ba14601debdd4eaef5eea5618652e8f1921b804
+  metadata.gz: 718119f26160876ed08c73e056c6c6a6fac928d4
+  data.tar.gz: 4ab87dc3f02770f23a464839c1103b202d8734d7
 SHA512:
-  metadata.gz: 5aece35f71de5f5a1d3c4c3a091287c2a77b644946f03c8bd3aab4d2d3c85ee6eb5a5d8ba4eda4849a9c016a1b0d344fa2bb828b2d712ceff138c651107cf56a
-  data.tar.gz: c504c81f7fe8933de2f3b6df27b6b197fa9abb171260bf37d7aa624c08806a77a80c0717dcd371d38025e688c07421353224aaa51cae51fed882700572b17034
+  metadata.gz: 78717d85e30cd944a62a5ff52124a10fa4f0c2d97816a6c6d986b4a207f4b54bd405dc49e205e843215c4260dab03d12b4c10d68fce36cbdd8df8dc248bc5925
+  data.tar.gz: cc97d7773f5d4eb4c0332d5577cc57749dc05ba55897c4e2704c11915823ae2387767dd669e9a50f78257370e968c534e386e3dbd0f08f059b71e89029b13450

data/.gitignore

@@ -18,6 +18,9 @@
 .repl_history
 build/
 
+# I don't want Gemfile.lock
+Gemfile.lock
+
 ## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/
@@ -35,4 +38,4 @@ build/
 # .ruby-gemset
 
 # unless supporting rvm < 1.11.0 or doing something fancy, ignore this:
-.rvmrc
+.rvmrc

data/Rakefile

@@ -1,2 +1 @@
-require "bundler/gem_tasks"
-
+require 'bundler/gem_tasks'

data/lib/oliver/argument_files/help.rb

@@ -1,58 +1,55 @@
 # Help the user with their heavy troubles
 def help
-
   helper = [
     [
-      "init",
+      'init',
       "initializes the main directory by creating a base #{Name::OLIVER}"
     ],
 
     [
-      "install",
+      'install',
       "clones / removes directories if they're listed on the #{Name::OLIVER}"
     ],
 
     [
-      "add username/repo",
-      "clone repo and add it to the #{Name::OLIVER}",
+      'add username/repo',
+      "clone repo and add it to the #{Name::OLIVER}"
     ],
 
     [
-      "remove username/repo",
-      "delete repo and remove it from the #{Name::OLIVER}",
+      'remove username/repo',
+      "delete repo and remove it from the #{Name::OLIVER}"
     ],
 
     [
-      "list",
+      'list',
       "list repos currently on the #{Name::OLIVER}"
     ],
 
     [
-      "update",
+      'update',
       "pull updates from each tracked repo on the #{Name::OLIVER}"
     ],
 
     [
-      "-v",
-      "return oliver's version"
+      '-h',
+      'return oliver\'s version'
     ],
 
     [
-      "-h",
-      "return this help menu"
+      '-h',
+      'return this help menu'
     ]
   ]
 
   top_message = 'oliver - help / usage'
 
   puts Rainbow(top_message).red
-  (top_message.length + 1).times { print Rainbow("=").yellow }
+  (top_message.length + 1).times { print Rainbow('=').yellow }
   puts
 
   helper.map do |line, blurb|
     puts "#{Rainbow(line).green} # => #{Rainbow(blurb).blue}"
   end
-
   exit
-
 end

data/lib/oliver/argument_files/init.rb

@@ -1,6 +1,5 @@
 def init
-
-  if !ARGV[1].nil?
+  unless ARGV[1].nil?
     if ARGV[2].nil?
       dir_name = 'olives'
     else
@@ -9,7 +8,7 @@ def init
     if ARGV[1].downcase == '--directory'
       Dir.mkdir dir_name
       Dir.chdir(dir_name)
-      random_text = Rainbow("Changed directory").blue
+      random_text = Rainbow('Changed directory').blue
       puts "#{Rainbow(dir_name).green}/ has been created."
       puts "#{random_text} into #{Rainbow(dir_name).green}/."
     end

data/lib/oliver/argument_files/install.rb

@@ -1,13 +1,12 @@
 def install
-  if !File.file? Name::OLIVER
+  unless 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
+  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)
@@ -15,7 +14,7 @@ def install
   final = YAML.load("---\n#{body}\n---")
 
   # 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."
@@ -25,14 +24,13 @@ 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 '/'
-    username = splitted[0]
     repo = splitted[1]
     current_repos = Dir.entries '.'
     ['.', '..', '.backup', Name::OLIVER].each do |i|
@@ -41,7 +39,7 @@ Try adding something to the list for the time being."
 
     # Clone the repo if it doesn't already exist
     if !File.directory?(repo)
-      %x(git clone git://github.com/#{url} --quiet)
+      `git clone git://github.com/#{url} --quiet`
       if File.directory?(repo)
         puts "#{Rainbow(repo).green}/ has been successfully cloned."
       else
@@ -54,14 +52,13 @@ Try adding something to the list for the time being."
     # 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
+      if !listed_repos.to_s.include?(directory_thing) &&
+                          File.directory?(directory_thing)
+        `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/argument_files/list.rb

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

data/lib/oliver/argument_files/remove.rb

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

data/lib/oliver/argument_files/update.rb

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

data/lib/oliver/arguments.rb

@@ -34,9 +34,9 @@ def arguments
     help
   when '-v' || '--version'
     puts "#{Rainbow('oliver').red} #{Rainbow("v#{Oliver::VERSION}").green}"
-   help
+    exit
  else
-   help
+    help
  end
   exit
 end

data/lib/oliver/main.rb

@@ -1,3 +1,3 @@
 # Main oliver file
 def run_main
-  end
+end

data/lib/oliver/oliver_file_name.rb

@@ -1,3 +1,5 @@
+# The main module for whatever [you]
+# want the main (YAML) file to be called
 module Name
   OLIVER = 'Olivefile'
 end

data/lib/oliver/version.rb

@@ -1,3 +1,5 @@
+# The main module for
+# Oliver's version
 module Oliver
-  VERSION = "1.5.5.2"
+  VERSION = '1.5.5.3'
 end

data/lib/oliver.rb

@@ -2,10 +2,9 @@
 # twss
 require 'rainbow'
 require 'YAML'
-require_relative "oliver/oliver_file_name"
-require_relative "oliver/arguments"
-require_relative "oliver/version"
-require_relative "oliver/main"
+%w(oliver_file_name arguments version main).each do |file|
+  require_relative "oliver/#{file}"
+end
 
 # if the user doesn't want to use rainbow
 # just disable it completely

data/oliver.gemspec

@@ -4,18 +4,18 @@ require File.expand_path('../lib/oliver/version', __FILE__)
 Gem::Specification.new do |gem|
   gem.authors       = ['Josh']
   gem.email         = ['joshception@icloud.com']
-  gem.description   = %q{Local Git(Hub) made easy.}
-  gem.summary       = %q{Manage your Git(Hub) easier.}
+  gem.description   = 'Local Git(Hub) made easy.'
+  gem.summary       = 'Manage your Git(Hub) easier.'
   gem.homepage      = 'https://github.com/trommel/oliver'
 
-  gem.files         = `git ls-files`.split($\)
-  gem.executables   = ['olive', 'oliver']
+  gem.files         = `git ls-files`.split($ORS)
+  gem.executables   = %w(olive oliver)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = 'oliver'
-  gem.require_paths = ['oliver']
+  gem.require_paths = %w(oliver)
   gem.version       = Oliver::VERSION
 
-  gem.add_development_dependency "bundler", "~> 1.6"
-  gem.add_development_dependency "rake"
+  gem.add_development_dependency 'bundler', '~> 1.6'
+  gem.add_development_dependency 'rake'
   gem.add_dependency 'rainbow', '>= 2.0.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 1.5.5.2
+  version: 1.5.5.3
 platform: ruby
 authors:
 - Josh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-30 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -64,7 +64,6 @@ files:
 - ".gitignore"
 - CONTRIBUTING.md
 - Gemfile
-- Gemfile.lock
 - IDEAS.md
 - LICENSE
 - README.md

data/Gemfile.lock

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