oliver 2.2.2 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 18052b82cc0b4636492f1bfb5ddf680a0da6201a
-  data.tar.gz: eea31f3199d680d26e765ae70bc46eeee6692bb0
+  metadata.gz: dab3aaf89df3b265a927670055cf2c94e97f07d5
+  data.tar.gz: 54a12a48d5046fa4b1639f143775879636f3da63
 SHA512:
-  metadata.gz: 00054f43d22ea612502b65d9756649707c26157f6e8a8a00be5d586268cc34a382c1f27c7f98cbbe492abea0413b4f6c64b51251a6f794b8c036b8c95d1bd8a5
-  data.tar.gz: 0918db974a47210ca7d213a4cb527cb44b9f0fb9142597774cb63937bb8e491a2de07d59cb386042d9268a3d9e1c6426a12b90a43ec80f2a4d29448ea283de1b
+  metadata.gz: c6d07f6a59895912ee9c053218ea9b15b9e953e1f2cd2d452b32b250cdf90d2ecd07b3cc283c6062701f628aeceb82bd5ae0170a449977eae3ca21cdb9730f26
+  data.tar.gz: c5c3e23ecee75830a3171db3a554a973ed2c83004dacbe9800e518a5b54956e42a8279518344e699f98b70405d3b1f154d029bae4de9e9cfb2055eae288596a5

data/README.md

@@ -44,15 +44,10 @@ and then add whatever you'd like to the file (write in JSON)
 	],
 	"Braeden-Mayer": [
 		"Top-Hat"
-	],
-	"misc": [
-		"https://exampleserver.com/repo"
 	]
 }
 ```
 
-- Use `Misc` for URLs that aren't hosted on GitHub
-
 ### Initializing the root
 
 Creates the base `.oliver` file

data/lib/oliver/commands.rb

@@ -8,10 +8,26 @@ require_relative 'file_manager'
 module Oliver
   module_function
 
+  def get_local_repos
+    temp = []
+    temp = Dir.entries('.').reject do |f|
+      f['.'] || f['..'] || f[Oliver::NAME]
+    end
+    return temp.sort
+  end
+
+  def get_tracked_repos
+    temp = []
+    FileManager::BODY.map do |user, repo|
+      temp << repo
+    end
+    return temp.first.sort
+  end
+
   def init
     unless File.exists?(Oliver::NAME)
       File.open(Oliver::NAME, 'w') do |file|
-        tempHash = { trommel: ["oliver"] }
+        tempHash = { probablyjosh: ["oliver"] }
         file.write(JSON.pretty_generate(tempHash))
         puts "#{Oliver::NAME} created sucessfully" if @options[:verbose]
       end
@@ -54,23 +70,18 @@ module Oliver
         end
       end
 
-      dirRepos = Dir.entries('.').reject do |f|
-        f['.'] || f['..'] || f[Oliver::NAME]
-      end
-      dirRepos.sort!
-
-      trackedRepos ||= []
-      FileManager::BODY.each do |user|
-        user[1].each { |repo| trackedRepos << repo }
-      end
-      trackedRepos.sort!
+      dirRepos = get_local_repos
+      trackedRepos = get_tracked_repos
 
       unless dirRepos == trackedRepos
         dirRepos ||= []
         trackedRepos ||= []
         dirRepos -= trackedRepos
         unless dirRepos.empty?
-          dirRepos.each { |dirRepo| FileUtils.rm_rf(dirRepo) }
+          dirRepos.each do |dirRepo|
+            puts "Removing #{dirRepo}" if @options[:verbose]
+            FileUtils.rm_rf(dirRepo)
+          end
         end
       end
 
@@ -78,17 +89,25 @@ module Oliver
   end
 
   def list
-    unless FileManager::BODY.nil?
-      FileManager::BODY.map do |user, repos|
-        repos ||= []
-        # Add silent shit later when it's actually working
-        unless repos.empty?
-          repos.each do |repo|
-            if File.directory?(repo) then print '# ' else print '+ ' end # bugs
-            puts repo
-          end
-        end
-      end
+    dirRepos = get_local_repos
+    trackedRepos = get_tracked_repos
+
+    # If repo exists in
+    # - .oliver and in directory, print "#" (neutral)
+    # - only .oliver, print "+" (clone)
+    # - only directory, print "-" (remove)
+
+    # If repos and directories are identical, just print # next to repo name
+    dirRepos.each {|repo| puts "# #{repo}" } if dirRepos == trackedRepos
+
+    # If repo only exists in .oliver, print '+'
+    dirRepos.each do |repo|
+      puts "+ #{repo}" unless trackedRepos.include? repo
+    end
+
+    # If repo only exists in directory, print '-'
+    trackedRepos.each do |repo|
+      puts "- #{repo}" unless dirRepos.include? repo
     end
   end
 

data/lib/oliver/version.rb

@@ -1,8 +1,8 @@
 module Oliver
   module Version
     MAJOR = 2
-    MINOR = 2
-    PATCH = 2
+    MINOR = 3
+    PATCH = 0
     STRING = [MAJOR, MINOR, PATCH].compact.join('.')
   end
 end

data/lib/oliver.rb

@@ -65,21 +65,17 @@ module Oliver
       advice.map { |key, value| puts "#{key}    \t#{value}" }
     end
 
-     advice # return advice
+     advice # Return advice
   end
 
   def build(commands)
     require_relative 'oliver/commands'
     @command = @command.split(' ')
     case @command.first
-    when 'init'
-      init
-    when 'install'
-      install
-    when 'list'
-      list
-    when 'pull', 'update'
-      pull
+    when 'init' then init
+    when 'install' then install
+    when 'list' then list
+    when 'pull', 'update' then pull
     else end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 2.2.2
+  version: 2.3.0
 platform: ruby
 authors:
 - Josh Trommel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-14 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler