oliver 2.0.1 → 2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e4e92685d0280c2290a1365b18ad58994f499238
-  data.tar.gz: f0e8746522e31b2892537c9f0bb3faed7b088376
+  metadata.gz: 1d4e2a38b5314134cc132c1cd65e6b94ed7a2bc2
+  data.tar.gz: fa2d65fcc431a5bf88c805c4646fe73a76cb45b0
 SHA512:
-  metadata.gz: 8e77df90be0b318017103eb9c76b347cd4f979d590bf7b1340f0bc026a688d96d0747e0d87a2326780b2c6312a6c49ffd7291671d1d2e9add080ec3cd328eb8b
-  data.tar.gz: dfacb270a4483ef4e3aa3736af960342bbfb37c564dd499ba490e67513bb25916205eb33010c1ed63a818e15e772b9e86339a45b0f1a4db59b06d05cc332b9e8
+  metadata.gz: 1b5c3963c81d701154eae7bd196873b1b3137471796ac20c2cc296e75bb00491eb98b8744d131c9a8cae1a46a402849788f359b7b9ca45ae5e9f28cbcda2d3de
+  data.tar.gz: 2dead40f0c7f91725b11a08ae0518ce74e28576ba28e1794d5fa40ef57b329b2f04a66bae8e97a97fc9e9722dc8fe5b889f5b5edf202a4a94e2f5536b398d460

data/.rspec

@@ -0,0 +1,2 @@
+--color
+--require spec_helper

data/IDEAS.md

@@ -33,3 +33,8 @@ $ olive install
 to do it, though, so.. yeah~~
 
 ~~I'll add it as soon as I can figure it out.~~
+
+- [ ] when deleting repos check if everything's been pushed and only
+delete without prompting the user first if everything has. if there's still shit
+that hasn't been pushed ask the user and double check if they wanted
+to do all that work for nothin'

data/README.md

@@ -31,19 +31,17 @@ and then add whatever you'd like to the file (write in JSON)
 
 ```json
 {
-	"repos": {
-		"trommel": [
-			"oliver",
-			"textymous"
-		],
-		"istx25": [
-			"Fluorescent",
-			"dotfiles"
-		],
-		"misc": [
-			"https://exampleserver.com/repo"
-		]
-	}
+	"trommel": [
+		"oliver",
+		"textymous"
+	],
+	"istx25": [
+		"Fluorescent",
+		"dotfiles"
+	],
+	"misc": [
+		"https://exampleserver.com/repo"
+	]
 }
 ```
 
@@ -59,7 +57,8 @@ $ olive init
 
 Clones repos listedy and
 removes ones saved locally that aren't found
-in the file
+in the file. Careful removing directories from the list because
+[Olive will delete them without a second thought](#to-do).
 
 ```bash
 $ olive install
@@ -89,6 +88,9 @@ $ olive update
 To-Do
 -----
 
+- [ ] Add `.settings` file for better customization and easier options usage
+- [ ] In `.settings`, give option to enable a "safe barrier", essentially
+Oliver will prompt you before it removes any directory
 - [x] Remake the help/info thing to be slimmer & look better
 - [x] Expand repo support to Git in general, not just GitHub
 - [ ] Add support to `olive list` so that it'll list repos that're already cloned but not on the list (so the user knows that it's being removed on the next `olive install`)

data/community/iOS-external-libraries-istx25.yml

@@ -1,74 +1,72 @@
 {
-  "repos": {
-    "samvermette": [
-      "UIAlertView-Blocks",
-      "Montreal-Collective",
-      "SVSegmentedControl",
-      "iOS-Simulator-Raindrop",
-      "RaptureXML",
-      "emphasize.js",
-      "objc-geohash",
-      "SVStatusHUD"
-    ],
-    "gcamp": [
-      "services-to-omnifocus",
-      "OpenTripPlanner",
-      "github-omnifocus-sync"
-    ],
-    "TransitApp": [
-      "SVProgressHUD",
-      "SVHTTPRequest",
-      "SVWebViewController"
-    ],
-    "misc": [
-      "stefanceriu/SCSiriWaveformView",
-      "KjulyKYCircleMenu",
-      "chillok/AnimatedCircularCollectionMenu",
-      "YoApp/hey",
-      "opentripplanner/OpenTripPlanner",
-      "ghvillasboas/CloudKitTest",
-      "lovell/sharp",
-      "davidluzgouveia/ParallaxScrolling",
-      "ellisonleao/magictools",
-      "buger/gor",
-      "OpenRA/OpenRA",
-      "cocos2d/cocos2d-x",
-      "AdamsLair/duality",
-      "quicksilver/Quicksilver",
-      "muan/github-gmail",
-      "AgileBits/onepassword-app-extension",
-      "snowshoestamp/python_sdk",
-      "abraham/twitteroauth",
-      "rs/SDWebImage",
-      "maddox/regexkit",
-      "tonymillion/Reachability",
-      "ole/OBGradientView",
-      "stig/json-framework",
-      "flori/json",
-      "crino/instagram-ios-sdk",
-      "dalexsoto/HardwareInfo",
-      "nicklockwood/FXPageControl",
-      "fhsjaagshs/FHSTwitterEngine",
-      "enormego/EGOTableViewPullRefresh",
-      "Darktt/DTAlertView",
-      "kriskowal/transcode",
-      "pokeb/asi-http-request",
-      "Cue/CueTableReloader",
-      "AFNetworking/AFNetworking",
-      "yashigani/YSViewer",
-      "nicklockwood/SwipeView",
-      "CEWendel/SWTableViewCell",
-      "stefanoa/SASlideMenu",
-      "datwelk/RDRStickyKeyboardView",
-      "MacMannes/MKInfoPanel",
-      "jdg/MBProgressHUD",
-      "JLZ/JZSwipeCell",
-      "autresphere/ASDepthModal",
-      "marshluca/PolylineDemo",
-      "wit-ai/wit-ios-sdk",
-      "koenbok/Framer",
-      "mattdonnelly/Swifter",
-      "cloudapp/api"
-    ]
-  }
+  "samvermette": [
+    "UIAlertView-Blocks",
+    "Montreal-Collective",
+    "SVSegmentedControl",
+    "iOS-Simulator-Raindrop",
+    "RaptureXML",
+    "emphasize.js",
+    "objc-geohash",
+    "SVStatusHUD"
+  ],
+  "gcamp": [
+    "services-to-omnifocus",
+    "OpenTripPlanner",
+    "github-omnifocus-sync"
+  ],
+  "TransitApp": [
+    "SVProgressHUD",
+    "SVHTTPRequest",
+    "SVWebViewController"
+  ],
+  "misc": [
+    "stefanceriu/SCSiriWaveformView",
+    "KjulyKYCircleMenu",
+    "chillok/AnimatedCircularCollectionMenu",
+    "YoApp/hey",
+    "opentripplanner/OpenTripPlanner",
+    "ghvillasboas/CloudKitTest",
+    "lovell/sharp",
+    "davidluzgouveia/ParallaxScrolling",
+    "ellisonleao/magictools",
+    "buger/gor",
+    "OpenRA/OpenRA",
+    "cocos2d/cocos2d-x",
+    "AdamsLair/duality",
+    "quicksilver/Quicksilver",
+    "muan/github-gmail",
+    "AgileBits/onepassword-app-extension",
+    "snowshoestamp/python_sdk",
+    "abraham/twitteroauth",
+    "rs/SDWebImage",
+    "maddox/regexkit",
+    "tonymillion/Reachability",
+    "ole/OBGradientView",
+    "stig/json-framework",
+    "flori/json",
+    "crino/instagram-ios-sdk",
+    "dalexsoto/HardwareInfo",
+    "nicklockwood/FXPageControl",
+    "fhsjaagshs/FHSTwitterEngine",
+    "enormego/EGOTableViewPullRefresh",
+    "Darktt/DTAlertView",
+    "kriskowal/transcode",
+    "pokeb/asi-http-request",
+    "Cue/CueTableReloader",
+    "AFNetworking/AFNetworking",
+    "yashigani/YSViewer",
+    "nicklockwood/SwipeView",
+    "CEWendel/SWTableViewCell",
+    "stefanoa/SASlideMenu",
+    "datwelk/RDRStickyKeyboardView",
+    "MacMannes/MKInfoPanel",
+    "jdg/MBProgressHUD",
+    "JLZ/JZSwipeCell",
+    "autresphere/ASDepthModal",
+    "marshluca/PolylineDemo",
+    "wit-ai/wit-ios-sdk",
+    "koenbok/Framer",
+    "mattdonnelly/Swifter",
+    "cloudapp/api"
+  ]
 }

data/lib/oliver/commands.rb

@@ -1,3 +1,4 @@
+require 'awesome_print'
 require 'json'
 require 'git'
 require 'fileutils'
@@ -8,45 +9,46 @@ require_relative 'file_manager'
 module Oliver
   module_function
 
-  def init(options)
-    options = options[:options]
+  def init
     unless File.exists?(Oliver::NAME)
       File.open(Oliver::NAME, 'w') do |file|
-        tempHash = { repos: { trommel: ["oliver"] } }
+        tempHash = { trommel: ["oliver"] }
         file.write(JSON.pretty_generate(tempHash))
-        puts "#{Oliver::NAME} created sucessfully" if options[:verbose]
+        puts "#{Oliver::NAME} created sucessfully" if @options[:verbose]
       end
     end
   end
 
   # I'm honestly ashamed of this piece of shit, it's hack as fuck
-  def install(options)
-    options = options[:options] # DRY
+  def install
     unless FileManager::BODY.nil?
-      FileManager::BODY['repos'].map do |user, repos|
+      FileManager::BODY.map do |user, repos|
         user  ||= ''
         repos ||= []
 
         # Add options[:verbose] support as soon as this doesn't look awful
         unless user.empty? || repos.nil?
           repos.each do |repo|
-            if File.directory?(repo)
-              puts "Warning: #{repo}/ already exists"
-            else
+
+            unless File.directory?(repo)
               if user.downcase == 'misc'
-                cloned_repo = Git.clone(repo, repo.split('/').last, :path => '.')
+                cloned_repo = Git.clone(
+                      repo,
+                      repo.split('/').last
+                      )
               else
                 cloned_repo = Git.clone(
                       "https://github.com/#{user}/#{repo}",
-                      repo,
-                      :path => '.'
+                      repo
                   )
               end
-              if File.directory?(repo) || File.directory?(repo.split('/').last)
-                puts "Success: #{repo}/ has been cloned"
+
+              if !cloned_repo.nil?
+                puts "Success: #{repo}/ has been cloned" if @options[:verbose]
               else
                 puts "Warning: #{repo}/ failed to clone"
               end
+
             end
           end
         end
@@ -57,28 +59,26 @@ module Oliver
       end
       dirRepos.sort!
 
-      trackedRepos = FileManager::BODY['repos'].map do |user, repos|
-        repos.select { |repo| repo }
+      trackedRepos ||= []
+      FileManager::BODY.each do |user|
+        user[1].each { |repo| trackedRepos << repo }
       end
       trackedRepos.sort!
-      trackedRepos = trackedRepos.first
 
       unless dirRepos == trackedRepos
         dirRepos ||= []
         trackedRepos ||= []
         dirRepos -= trackedRepos
         unless dirRepos.empty?
-          dirRepos.each do |dirRepo|
-            print "Warning: Enter '#{dirRepo}' to locally delete the repo: "
-            FileUtils.rm_rf(dirRepo) if STDIN.gets.chomp.downcase == dirRepo
-          end
+          dirRepos.each { |dirRepo| FileUtils.rm_rf(dirRepo) }
         end
       end
+
     end
   end
 
   def list
-    FileManager::BODY["repos"].map do |user, repos|
+    FileManager::BODY.map do |user, repos|
       repos ||= []
       # Add silent shit later when it's actually working
       unless repos.empty?
@@ -91,8 +91,7 @@ module Oliver
   end
 
   # Still buggy, afaik
-  def update(options)
-    options = options[:options] # DRY
+  def update
     dirs = Dir.glob('*').select { |f| File.directory? f }
     dirs.each do |dir|
       Dir.chdir(dir)

data/lib/oliver/version.rb

@@ -1,4 +1,4 @@
 # Oliver's version
 module Oliver
-  VERSION = '2.0.1'
+  VERSION = '2.1'
 end

data/lib/oliver.rb

@@ -73,13 +73,13 @@ module Oliver
     @command = @command.split(' ')
     case @command.first
     when 'init'
-      init(options:@options)
+      init
     when 'install'
-      install(optoins:@options)
+      install
     when 'list'
       list
     when 'update'
-      update(optoins:@options)
+      update
     else end
   end
 end

data/spec/oliver_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require_relative '../lib/oliver'
+
+describe Oliver do
+  before :each do
+
+    describe "#new" do
+      it "creates a new instance of oliver with no arguments" do
+        Oliver.run(''))
+      end
+    end
+
+    describe "#version" do
+    it "returns the version" do
+      Oliver.run('version')
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,91 @@
+# This file was generated by the `rspec --init` command. Conventionally, all
+# specs live under a `spec` directory, which RSpec adds to the `$LOAD_PATH`.
+# The generated `.rspec` file contains `--require spec_helper` which will cause
+# this file to always be loaded, without a need to explicitly require it in any
+# files.
+#
+# Given that it is always loaded, you are encouraged to keep this file as
+# light-weight as possible. Requiring heavyweight dependencies from this file
+# will add to the boot time of your test suite on EVERY test run, even for an
+# individual file that may not need all of that loaded. Instead, consider making
+# a separate helper file that requires the additional dependencies and performs
+# the additional setup, and require it from the spec files that actually need
+# it.
+#
+# The `.rspec` file also contains a few flags that are not defaults but that
+# users commonly want.
+#
+# See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
+RSpec.configure do |config|
+  # rspec-expectations config goes here. You can use an alternate
+  # assertion/expectation library such as wrong or the stdlib/minitest
+  # assertions if you prefer.
+  config.expect_with :rspec do |expectations|
+    # This option will default to `true` in RSpec 4. It makes the `description`
+    # and `failure_message` of custom matchers include text for helper methods
+    # defined using `chain`, e.g.:
+    #     be_bigger_than(2).and_smaller_than(4).description
+    #     # => "be bigger than 2 and smaller than 4"
+    # ...rather than:
+    #     # => "be bigger than 2"
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    # Prevents you from mocking or stubbing a method that does not exist on
+    # a real object. This is generally recommended, and will default to
+    # `true` in RSpec 4.
+    mocks.verify_partial_doubles = true
+  end
+
+# The settings below are suggested to provide a good initial experience
+# with RSpec, but feel free to customize to your heart's content.
+=begin
+  # These two settings work together to allow you to limit a spec run
+  # to individual examples or groups you care about by tagging them with
+  # `:focus` metadata. When nothing is tagged with `:focus`, all examples
+  # get run.
+  config.filter_run :focus
+  config.run_all_when_everything_filtered = true
+
+  # Limits the available syntax to the non-monkey patched syntax that is
+  # recommended. For more details, see:
+  #   - http://myronmars.to/n/dev-blog/2012/06/rspecs-new-expectation-syntax
+  #   - http://teaisaweso.me/blog/2013/05/27/rspecs-new-message-expectation-syntax/
+  #   - http://myronmars.to/n/dev-blog/2014/05/notable-changes-in-rspec-3#new__config_option_to_disable_rspeccore_monkey_patching
+  config.disable_monkey_patching!
+
+  # This setting enables warnings. It's recommended, but in some cases may
+  # be too noisy due to issues in dependencies.
+  config.warnings = true
+
+  # Many RSpec users commonly either run the entire suite or an individual
+  # file, and it's useful to allow more verbose output when running an
+  # individual spec file.
+  if config.files_to_run.one?
+    # Use the documentation formatter for detailed output,
+    # unless a formatter has already been configured
+    # (e.g. via a command-line flag).
+    config.default_formatter = 'doc'
+  end
+
+  # Print the 10 slowest examples and example groups at the
+  # end of the spec run, to help surface which specs are running
+  # particularly slow.
+  config.profile_examples = 10
+
+  # Run specs in random order to surface order dependencies. If you find an
+  # order dependency and want to debug it, you can fix the order by providing
+  # the seed, which is printed after each run.
+  #     --seed 1234
+  config.order = :random
+
+  # Seed global randomization in this process using the `--seed` CLI option.
+  # Setting this allows you to use `--seed` to deterministically reproduce
+  # test failures related to randomization by passing the same `--seed` value
+  # as the one that triggered the failure.
+  Kernel.srand config.seed
+=end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oliver
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: '2.1'
 platform: ruby
 authors:
 - Josh Trommel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".rspec"
 - CONTRIBUTING.md
 - Gemfile
 - IDEAS.md
@@ -106,6 +107,8 @@ files:
 - lib/oliver/settings.rb
 - lib/oliver/version.rb
 - oliver.gemspec
+- spec/oliver_spec.rb
+- spec/spec_helper.rb
 homepage: https://github.com/trommel/oliver
 licenses: []
 metadata: {}
@@ -129,4 +132,6 @@ rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Manage your Git(Hub) repos/projects easier.
-test_files: []
+test_files:
+- spec/oliver_spec.rb
+- spec/spec_helper.rb