vendorificator 0.5.git.v0.4.0.17.g26d50d8 → 0.5.git.v0.4.0.60.g9c35209

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmMwNmEwMDhlYTI0Y2Q1MmQxY2E3MmFkZmNmYjE2Zjg3YTdiNGZlZQ==
+    ZWI0NzRjOTRjNDkzZTI2NjkyY2NhZDJhYjE4NDU3NGI5ZDIyZTY4Zg==
   data.tar.gz: !binary |-
-    NzY3ZmNkZTRjOTNjMWQzNWJmMGFmZTJjNGJlYTViZTJmZmQ2NmZjYQ==
+    ZWQwNTNhNWFhMTY5ZDhhZWM0MjJjMTI2Y2IzZGU2ZTQ3NGY2ZGZlZA==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDNmZGIwYzNhZGJjZjIwNTk3NzhlZDRjYWRkMDZlZmJhNmM4ODA2YWQ4MTBj
-    MGUwZTFiZWNjZjI4ZmViNzQ5YmQ4OGU2ODdlYTNhNTg5OWQ5NmU5YWE0ZTM3
-    NjJmODhkOGIxZTQzYTk0M2Y5ZmM4M2NmMTI0NWQ3OWQzMjE0NjM=
+    Y2Q1MDc2YjNmMzgxMWI1N2RhNjRmMWVkYzYzYTAyMjA4MTYzMjMwNmVkZmJi
+    MmNkY2FkN2VmMGM4MzdlMDFkM2VlMmZiYTM5MmRjM2VmM2M2YzJhNTk2M2Vh
+    M2FlNmQ5M2EzYjZhODNjYmZiNGIwZmViNGNlZmVjZDhjZTU4YjQ=
   data.tar.gz: !binary |-
-    ODdlNmQzODdjNTA0MjBkZWFkYTMzMjkwZTdjNzNhNTE1ZmEzYzZhOTI3MTU4
-    MjJmNjBmZTgwMTU4MjczNmYyZTFhMjUyNDQ2ZTEwZTUzYmNlODA2NDg2NjRl
-    NDNlOTc5OTZlNmQ4ZWRhZDQzZjUwMDc2M2ExMWMyZDM5ZmMxNmU=
+    YjE3ZjE1MjYzYTc4NjFiZWU3MTM1MGI5MGE1OWQ4ZWZiZjY2NmZlMDFjNzFl
+    MTRhOTA1Yjc4N2ZlOTQ0ZWI3ZDk5ODAyZWFlZGJjMjE4MzhhM2FiNTA5NWJh
+    YTdlYjliY2MyNDIzMmFiNjY0MjQzYzhkM2RjMjhjZjEwYzM0ZjY=

data/Gemfile

@@ -19,4 +19,5 @@ group :development_workstation do
   gem "pry"
   gem "awesome_print"
   gem "relish"
+  gem 'debugger'
 end

data/README.md

@@ -57,8 +57,8 @@ detail.
    a Git remote
  * `vendor push` will push all vendor branches, tags, and notes to
    a Git remote
- * `vendor diff` will show the differences between vendor module's
-   pristine branch and curent work tree
+ * `vendor diff` will show a `git diff` of vendor module's files between vendor
+   module's pristine branch and current work tree
  * `vendor log` will show a `git log` of all changes made to a particular
    vendor module's files that are not in module's pristine branch
 
@@ -112,10 +112,10 @@ It takes following options:
  * `:version` - the version of module. If the module's contents should
    change, increase the version, so that Vendorificator knows it needs
    to re-create the module.
- * `:category` - module's *category* is subdirectory of the basedir
+ * `:group` - module's *group* is subdirectory of the basedir
    where module's directory will be created. For example, `vendor
    "foo"` will go to `vendor/foo` by default, but `vendor "foo",
-   :category => :widgets` will go to `vendor/widgets/foo`. It is also
+   :group => :widgets` will go to `vendor/widgets/foo`. It is also
    added in a similar way to module's branch name, tag names, etc.
  * `:path` - lets you specify subdirectory in which the module will be
    downloaded
@@ -197,7 +197,7 @@ Example:
 ```ruby
 git 'git://github.com/mpasternacki/nagios.git',
     :branch => 'COOK-1997',
-    :category => :cookbooks,
+    :group => :cookbooks,
     :version => '0.20130124.2'
 ```
 
@@ -206,7 +206,7 @@ git 'git://github.com/mpasternacki/nagios.git',
 Downloads an Opscode Chef cookbook from http://community.opscode.com/
 website (same thing that `knife cookbook site install` does). It
 resolves dependencies -- all needed modules will be downloaded by
-default. Its category defaults to `:cookbooks`. It may take the same
+default. Its group defaults to `:cookbooks`. It may take the same
 arguments as `archive` (but the name and possibly version is almost
 always enough), plus:
 
@@ -238,7 +238,7 @@ option to add it:
 
 ```ruby
 git 'git://github.com/user/cookbook.git',
-  :category => :cookbooks,
+  :group => :cookbooks,
   :hooks => 'ChefCookbookDependencies'
 end
 ```

data/features/chef_cookbook.feature

@@ -5,7 +5,7 @@ Scenario: A single cookbook, without dependencies
     """ruby
     chef_cookbook 'apt'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | cookbooks/apt |
     | With file | metadata.rb   |
@@ -15,7 +15,7 @@ Scenario: Dependency hook
     """ruby
     chef_cookbook 'memcached'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | cookbooks/memcached | cookbooks/runit |
     | With file | metadata.rb         | metadata.rb     |
@@ -26,7 +26,7 @@ Scenario: Ignored dependency
     chef_cookbook_ignore_dependencies ['runit']
     chef_cookbook 'memcached'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | cookbooks/memcached |
     | With file | metadata.rb         |
@@ -40,7 +40,7 @@ Scenario: Ignored all dependencies
     chef_cookbook_ignore_dependencies true
     chef_cookbook 'chef-server'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | cookbooks/chef-server |
     | With file | metadata.rb           |

data/features/download.feature

@@ -5,7 +5,7 @@ Scenario: just URL as name
     """ruby
     download 'http://test-assets.3ofcoins.net.s3-website-us-east-1.amazonaws.com/testrepo-0.1.tar.gz'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | testrepo-0.1.tar.gz |
   And there's a git commit note including "ea207a" in "download_checksum"

data/features/edgecases.feature

@@ -7,7 +7,7 @@ Scenario: module with a .gitignore file
       File.open('.gitignore', 'w') { |f| f.puts 'ignored.txt' }
     end
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then the following has been conjured:
     | Name      | ignore     |
     | With file | .gitignore |
@@ -25,7 +25,7 @@ Scenario: module with a .gitignore file
       File.open('.gitignore', 'w') { |f| f.puts 'ignored.txt' }
     end
     """
-  And I run vendor command "sync"
+  And I run vendor command "install"
   Then the file "vendor/ignore/files.txt" should not contain "ignored.txt"
   And the file "vendor/ignore/ignored.txt" should contain exactly:
     """

data/features/environment.feature

@@ -8,7 +8,7 @@ Scenario: Pushing to remote repo
     end
     """
   And a remote repository
-  When I run vendor command "sync"
+  When I run vendor command "install"
   And I run vendor command "push"
   Then branch "vendor/generated" exists in the remote repo
   And tag "vendor/generated/0.23" exists in the remote repo
@@ -23,7 +23,7 @@ Scenario: Getting module information
     end
     """
   And a remote repository
-  When I run vendor command "sync"
+  When I run vendor command "install"
   And I run vendor command "info generated"
   Then the last vendor output should match /Module merged version: 0.23/
   And the last vendor output should match /unparsed_args/
@@ -36,7 +36,58 @@ Scenario: Getting revision information
     end
     """
   And a remote repository
-  When I run vendor command "sync"
+  When I run vendor command "install"
   And I run vendor command "info HEAD^2"
   Then the last vendor output should match /master, vendor\/generated/
   Then the last vendor output should match /:unparsed_args/
+
+Scenario: Working with empty Vendorfile
+  Given a repository with following Vendorfile:
+    """ruby
+    """
+  And a remote repository
+  When I run vendor command "sync"
+  And I run vendor command "list"
+  Then the last vendor output should match /\A\z/
+
+Scenario: Running tasks without Vendorfile where they don't need it
+  Given a directory named "foo"
+  When I cd to "foo"
+  And I run vendor command "help"
+  Then the last vendor output should match /diff \[MODULE \[MODULE \.\.\.\]\]/
+  And the last vendor output should not match /Vendorfile not found/
+
+Scenario: Running tasks without Vendorfile where they need it
+  Given a directory named "foo"
+  When I cd to "foo"
+  And I run vendor command "pull"
+  Then the last vendor output should match /Vendorfile not found/
+
+Scenario: Getting module list
+  Given a repository with following Vendorfile:
+    """ruby
+    vendor 'generated', :version => '0.23' do |v|
+      File.open('README', 'w') { |f| f.puts "Hello, World!" }
+    end
+    """
+  When I run vendor command "install"
+  And I run vendor command "list"
+  Then the last vendor output should match /Module: generated, version: 0.23/
+
+Scenario: Getting list of outdated modules
+  Given a repository with following Vendorfile:
+    """ruby
+    vendor 'generated', :version => '0.23' do |v|
+      File.open('README', 'w') { |f| f.puts "Hello, World!" }
+    end
+    """
+  When I run vendor command "install"
+  And I change Vendorfile to:
+    """ruby
+    vendor 'generated', :version => '0.42' do |v|
+      File.open('README', 'w') { |f| f.puts "Hello, Updated, World!" }
+      File.open('VERSION', 'w') { |f| f.puts v.version }
+    end
+    """
+  And I run vendor command "outdated"
+  Then the last vendor output should match /outdated\s+generated/

data/features/git.feature

@@ -5,7 +5,7 @@ Scenario: Vendorificating a git repo
     """ruby
     git "file://#{ENV['FIXTURES_DIR']}/git/testrepo"
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | testrepo                                 |
     | Version   | 10e9ac58c77bc229d8c59a5b4eb7422916453148 |
@@ -19,7 +19,7 @@ Scenario: Vendorificating a subdirectory from a git repo
     git "file://#{ENV['FIXTURES_DIR']}/git/testrepo",
         :subdirectory => 'test'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name          | testrepo                                 |
     | Version       | 10e9ac58c77bc229d8c59a5b4eb7422916453148 |
@@ -33,7 +33,7 @@ Scenario: Vendorificating a certain branch from a git repo
     git "file://#{ENV['FIXTURES_DIR']}/git/testrepo",
         :branch => 'topic/pink'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name          | testrepo                                 |
     | Version       | ecbfa229ba5f11c05b18bcc4f7c32b8f25d63f8c |
@@ -47,7 +47,7 @@ Scenario: Vendorificating a certain tag from a git repo
     git "file://#{ENV['FIXTURES_DIR']}/git/testrepo",
         :tag => 'email-v0'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name         | testrepo     |
     | Version      | email-v0     |
@@ -62,7 +62,7 @@ Scenario: Vendorificating a certain revision from a git repo
     git "file://#{ENV['FIXTURES_DIR']}/git/testrepo",
         :revision => '6ff1be'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name          | testrepo                                 |
     | Version       | 6ff1be9c3819c93a2f41e0ddc09f252fcf154f34 |

data/features/needed.feature

@@ -6,12 +6,12 @@ Scenario: already downloaded tarball
     archive :testrepo, :version => '0.1',
       :url => 'http://test-assets.3ofcoins.net.s3-website-us-east-1.amazonaws.com/testrepo-0.1.tar.gz'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then I'm on "master" branch
   And the last vendor output should match /module\s+testrepo/
   And the last vendor output should match "testrepo-0.1.tar.gz"
 
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then the last vendor output should match /module\s+testrepo/
   And the last vendor output should match /up to date\s+testrepo/
   And the last vendor output should not match "testrepo-0.1.tar.gz"

data/features/status.feature

@@ -16,12 +16,12 @@ Scenario: status new module
   Then the last vendor output should match /new\s+generated\/0.23/
 
 Scenario: status up-to-date module
-  When I run vendor command "sync"
+  When I run vendor command "install"
   And I run vendor command "status"
   Then the last vendor output should match /up to date\s+generated\/0.23/
 
 Scenario: status outdated modules
-  When I run vendor command "sync"
+  When I run vendor command "install"
   And I change Vendorfile to:
     """ruby
     vendor 'generated', :version => '0.42' do |v|
@@ -41,7 +41,7 @@ Scenario: Module's dependencies are statused if they are known
   And I run vendor command "status"
   Then the last vendor output should match /new\s+memcached/
   And the last vendor output should not match "runit"
-  When I run vendor command "sync"
+  When I run vendor command "install"
   And I run vendor command "status"
   Then the last vendor output should match /up to date\s+memcached/
   And the last vendor output should match /up to date\s+runit/

data/features/tarball.feature

@@ -5,7 +5,7 @@ Scenario: just URL as name
     """ruby
     archive 'http://test-assets.3ofcoins.net.s3-website-us-east-1.amazonaws.com/testrepo-0.1.tar.gz'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | testrepo-0.1        |
     | Version   | testrepo-0.1.tar.gz |
@@ -17,7 +17,7 @@ Scenario: URL as keyword
     archive :testrepo,
       :url => 'http://test-assets.3ofcoins.net.s3-website-us-east-1.amazonaws.com/testrepo-0.1.tar.gz'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | testrepo            |
     | Version   | testrepo-0.1.tar.gz |
@@ -31,7 +31,7 @@ Scenario: Version & checksum
       :version => '0.1',
       :checksum => 'ea207a896f929ffb3a1dfe128332d6134a18edab7c01b97bfb2b1c7eacebe0cb'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | testrepo     |
     | Version   | 0.1          |
@@ -48,7 +48,7 @@ Scenario: Wrong checksum
       :version => '0.1',
       :checksum => 'incorrect'
     """
-  When I run `vendor sync`
+  When I run `vendor install`
   Then it should fail
   And following has not been conjured:
     | Name      | testrepo     |
@@ -60,7 +60,7 @@ Scenario: Tarball without a root directory
     archive :testrepo,
       :url => 'http://test-assets.3ofcoins.net.s3-website-us-east-1.amazonaws.com/testrepo-0.1-noroot.tar.gz'
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name      | testrepo     |
     | With file | test/alias.c |

data/features/tarball_edit.feature

@@ -8,7 +8,7 @@ Scenario:
       FileUtils::rm Dir['test/archive*.c']
     end
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name         | testrepo       |
     | With file    | test/alias.c   |

data/features/tool.feature

@@ -20,7 +20,7 @@ Scenario: Use Gem bundler to download rubygems, and Vendorificator to vendor the
     source "file://#{ENV['FIXTURES_DIR']}/rubygems"
     gem "hello"
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
     | Path         | cache           |
@@ -33,7 +33,7 @@ Scenario: Bundler correctly downloads and caches dependencies
     source "file://#{ENV['FIXTURES_DIR']}/rubygems"
     gem "first"
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
     | Path         | cache           |
@@ -47,7 +47,7 @@ Scenario: directory contents are completely replaced on re-vendoring
     source "file://#{ENV['FIXTURES_DIR']}/rubygems"
     gem "hello"
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
     | Path         | cache           |
@@ -58,7 +58,7 @@ Scenario: directory contents are completely replaced on re-vendoring
     source "file://#{ENV['FIXTURES_DIR']}/rubygems"
     gem "first"
     """
-  And I run vendor command "sync"
+  And I run vendor command "install"
   Then following has been conjured:
     | Name         | bundler         |
     | Path         | cache           |

data/features/tool_shortcuts.feature

@@ -14,7 +14,7 @@ Scenario: rubygems_bundler
     source "file://#{ENV['FIXTURES_DIR']}/rubygems"
     gem "hello"
     """
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name         | rubygems        |
     | Path         | cache           |
@@ -35,7 +35,7 @@ Scenario: chef_berkshelf
   And I successfully run `berks install`
   And I successfully run `git add Berksfile Berksfile.lock`
   And I successfully run `git commit -m Berksfile`
-  When I run vendor command "sync"
+  When I run vendor command "install"
   Then following has been conjured:
     | Name         | cookbooks                   |
     | With file    | build-essential/metadata.rb  |

data/features/vendor.feature

@@ -9,7 +9,7 @@ Scenario:
       File.open('VERSION', 'w') { |f| f.puts v.version }
     end
     """
-  When I run vendor command "sync"
+  When I run vendor command "install -v 1"
   Then the following has been conjured:
     | Name      | generated |
     | Version   | 0.23      |

data/lib/vendorificator/cli.rb

@@ -14,6 +14,7 @@ require 'vendorificator'
 
 module Vendorificator
   class CLI < Thor
+    VERBOSITY_LEVELS = {1 => :quiet, 2 => :default, 3 => :chatty, 9 => :debug}
     attr_reader :environment
 
     check_unknown_options! :except => [:git, :diff, :log]
@@ -21,18 +22,16 @@ module Vendorificator
 
     default_task :help
 
-    class_option :file,    :aliases => '-f', :type => :string,
-      :banner => 'PATH'
-    class_option :debug,   :aliases => '-d', :type => :boolean, :default => false
-    class_option :quiet,   :aliases => '-q', :type => :boolean, :default => false
+    class_option :file, :aliases => '-f', :type => :string, :banner => 'PATH'
     class_option :modules, :aliases => '-m', :type => :string,  :default => '',
       :banner => 'mod1,mod2,...,modN',
       :desc => 'Run only for specified modules (name or path, comma separated)'
     class_option :version,                   :type => :boolean
-    class_option :help,    :aliases => '-h', :type => :boolean
+    class_option :verbose, :aliases => '-v', :type => :numeric
 
-    def initialize(args=[], options={}, config={})
+    def initialize(args = [], options = {}, config = {})
       super
+      parse_options
 
       if self.options[:debug]
         MiniGit.debug = true
@@ -43,13 +42,11 @@ module Vendorificator
         exit
       end
 
-      if self.options[:help] && config[:current_task].name != 'help'
-        invoke :help, [ config[:current_task].name ]
-        exit
-      end
-
-      @environment = Vendorificator::Environment.new(self.options[:file])
-      environment.shell = shell
+      @environment = Vendorificator::Environment.new(
+        shell,
+        VERBOSITY_LEVELS[self.options[:verbose]] || :default,
+        self.options[:file]
+      )
 
       class << shell
         # Make say_status always say it.
@@ -62,16 +59,37 @@ module Vendorificator
     desc :sync, "Download new or updated vendor files"
     method_option :update, :type => :boolean, :default => false
     def sync
+      say_status 'DEPRECATED', 'Using vendor sync is deprecated and will be removed in future versions. Use vendor install or vendor update instead.', :yellow
+      environment.sync options.merge(:modules => modules)
+    rescue DirtyRepoError
+      fail! 'Repository is not clean.'
+    rescue MissingVendorfileError
+      fail! "Vendorfile not found. Vendorificator needs to run in the directory containing Vendorfile or config/vendor.rb."
+    end
+
+    desc :install, "Download and install new or updated vendor files"
+    def install(*modules)
       environment.sync options.merge(:modules => modules)
     rescue DirtyRepoError
       fail! 'Repository is not clean.'
     end
 
+    desc :update, "Update installed vendor files"
+    def update(*modules)
+      environment.sync options.merge(:modules => modules, :update => true)
+    rescue DirtyRepoError
+      fail! 'Repository is not clean.'
+    end
+
     desc "status", "List known vendor modules and their status"
     method_option :update, :type => :boolean, :default => false
     def status
-      say_status 'WARNING', 'Git repository is not clean', :red unless environment.clean?
       environment.config[:use_upstream_version] = options[:update]
+      environment.load_vendorfile
+
+      say_status 'DEPRECATED', 'Using vendor status is deprecated and will be removed in future versions', :yellow
+      say_status 'WARNING', 'Git repository is not clean', :red unless environment.clean?
+
       environment.each_vendor_instance(*modules) do |mod|
         status_line = mod.to_s
 
@@ -87,11 +105,25 @@ module Vendorificator
         say_status( mod.status.to_s.gsub('_', ' '), status_line,
                     ( mod.status == :up_to_date ? :green : :yellow ) )
       end
+    rescue MissingVendorfileError
+      fail! "Vendorfile not found. Vendorificator needs to run in the directory containing Vendorfile or config/vendor.rb."
     end
 
     desc 'info MODULE', "Show module information"
     def info(mod_name)
       environment.info mod_name, options
+    rescue MissingVendorfileError
+      fail! "Vendorfile not found. Vendorificator needs to run in the directory containing Vendorfile or config/vendor.rb."
+    end
+
+    desc :list, 'List all currently installed modules'
+    def list
+      environment.list
+    end
+
+    desc :outdated, 'List all currently installed modules'
+    def outdated
+      environment.outdated
     end
 
     desc :pull, "Pull upstream branches from a remote repository"
@@ -101,6 +133,8 @@ module Vendorificator
       environment.pull_all options
     rescue DirtyRepoError
       fail! 'Repository is not clean.'
+    rescue MissingVendorfileError
+      fail! "Vendorfile not found. Vendorificator needs to run in the directory containing Vendorfile or config/vendor.rb."
     end
 
     desc :push, "Push local changes back to the remote repository"
@@ -109,10 +143,12 @@ module Vendorificator
       environment.push options
     rescue DirtyRepoError
       fail! 'Repository is not clean.'
+    rescue MissingVendorfileError
+      fail! "Vendorfile not found. Vendorificator needs to run in the directory containing Vendorfile or config/vendor.rb."
     end
 
-    desc "git GIT_COMMAND [GIT_ARGS [...]]",
-         "Run a git command for specified modules"
+    desc "git GIT_COMMAND [MODULE [MODULE ...]] [-- GIT_OPTIONS]",
+         "Run a git command for specified module(s)"
     long_desc <<EOF
   Run a git command for specified modules. Within GIT_ARGS arguments,
   you can use @MERGED@ and @PATH@ tags, which will be substituted with
@@ -122,17 +158,18 @@ module Vendorificator
   The 'diff' and 'log' commands are simple aliases for 'git' command.
 
   Examples:
-    vendor git log @MERGED@..HEAD -- @PATH@    # basic 'vendor log'
-    vendor git diff --stat @MERGED@ -- @PATH@  # 'vendor diff', as diffstat
+    vendor git log my_module -- @MERGED@..HEAD -- @PATH@    # basic 'vendor log'
+    vendor git diff module1 module2 -- --stat @MERGED@ -- @PATH@  # 'vendor diff', as diffstat
 EOF
     def git(command, *args)
+      modules, git_options = split_git_options(args)
       environment.each_vendor_instance(*modules) do |mod|
         unless mod.merged
-          say_status 'unmerged', mod.to_s, :red unless options[:only_changed]
+          say_status 'unmerged', mod.to_s, :red
           next
         end
 
-        actual_args = args.dup.map do |arg|
+        actual_args = git_options.dup.map do |arg|
           arg.
             gsub('@MERGED@', mod.merged).
             gsub('@PATH@', mod.work_dir)
@@ -143,16 +180,18 @@ EOF
       end
     end
 
-    desc "diff [OPTIONS] [GIT OPTIONS]",
+    desc "diff [MODULE [MODULE ...]] [-- GIT_OPTIONS]",
          "Show differences between work tree and upstream module(s)"
     def diff(*args)
-      invoke :git, %w'diff' + args + %w'@MERGED@ -- @PATH@'
+      modules, git_options = split_git_options(args)
+      invoke :git, %w'diff' + modules + %w'--' + git_options + %w'@MERGED@ -- @PATH@'
     end
 
-    desc "log [OPTIONS] [GIT OPTIONS]",
+    desc "log [MODULE [MODULE ...]] [-- GIT_OPTIONS]",
          "Show git log of commits added to upstream module(s)"
     def log(*args)
-      invoke :git, %w'log' + args + %w'@MERGED@..HEAD -- @PATH@'
+      modules, git_options = split_git_options(args)
+      invoke :git, %w'log' + modules + %w'--' + git_options + %w'@MERGED@..HEAD -- @PATH@'
     end
 
     desc :pry, 'Pry into the binding', :hide => true
@@ -184,21 +223,36 @@ EOF
 
     private
 
+    # Private: Parses general vendorificator options.
+    #
+    # Returns nothing.
+    def parse_options
+      if options[:version]
+        say "Vendorificator #{Vendorificator::VERSION}"
+        exit
+      end
+
+      if options[:verbose] && (!VERBOSITY_LEVELS.keys.include? options[:verbose])
+        fail! "Unknown verbosity level: #{options[:verbose].inspect}"
+      end
+    end
+
     def split_git_options(args)
-      case i = args.index('--git-options')
-      when nil then [ args, [] ]
-      when 0 then [ [], args[1..-1] ]
-      else [ args[0..(i-1)], args[(i+1)..-1] ]
+      case i = args.index('--')
+      when nil then [args, []]
+      when 0 then [[], args[1..-1]]
+      else [args[0..(i - 1)], args[(i + 1)..-1]]
       end
     end
 
     def modules
+      say_status 'DEPRECATED', 'Using --modules option is deprecated and will be removed in future versions.', :yellow unless options[:modules].empty?
       options[:modules].split(',').map(&:strip)
     end
 
-    def fail!(message, exception_message='I give up.')
+    def fail!(message, exception_message = 'I give up.')
       say_status('FATAL', message, :red)
-      raise Thor::Error, 'I give up.'
+      raise Thor::Error, exception_message
     end
 
   end