RubyGems - vendorificator - Versions diffs - 0.0.1 → 0.1.0 - Mend

vendorificator 0.0.1 → 0.1.0

Files changed (16) hide show

data/README.md +194 -3
data/features/chef_cookbook.feature +23 -10
data/features/fixtures/vcr_cassettes/vendorificator.yml +681 -0
data/features/git.feature +1 -1
data/features/needed.feature +2 -2
data/features/status.feature +3 -3
data/features/tarball.feature +5 -5
data/features/tarball_edit.feature +1 -1
data/features/vendor.feature +1 -1
data/lib/vendorificator/cli.rb +1 -1
data/lib/vendorificator/config.rb +0 -2
data/lib/vendorificator/hooks/chef_cookbook.rb +19 -6
data/lib/vendorificator/vendor.rb +4 -2
data/lib/vendorificator/version.rb +1 -1
data/lib/vendorificator.rb +1 -0
metadata +4 -4

data/README.md CHANGED Viewed

@@ -1,7 +1,6 @@
 # Vendorificator
-> **THIS WORK IS HEAVILY IN PROGRESS** and is far from usable yet. Sorry
-about that - I'm working on it. Expect first usable version in January 2013.
+> **THIS PROGRAM IS STILL IN BETA**, use on your own risk!
 ## About
@@ -34,7 +33,199 @@ Or install it yourself as:
 ## Usage
-TODO: Write usage instructions here
+Vendorificator is a command-line tool. The command is called `vendor`
+(`bundle exec vendor` if you use Bundler). It accepts multiple
+subcommands.
+Run `vendor` to see list of subcommands. Run `vendor help _command_`
+to get detailed description of a command.
+### Commands
+Most important commands are listed here; use `vendor help` for more
+detail.
+ * `vendor sync` will update all vendor modules that need updating
+ * `vendor status` will list all the modules and their status
+ * `vendor pull` will pull all vendor branches, tags, and notes from a
+   Git remote
+ * `vendor diff` will show the differences between vendor module's
+   pristine branch and curent 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
+## Configuration
+Vendorificator reads its configuration from a Ruby file named
+`Vendorfile` (or `config/vendor.rb`). If the file does not exist in
+the current directory, it looks for it in parent directories until it
+gets to the git repository's root. All files Vendorificator creates
+are rooted in directory containing the `Vendorfile` (or the directory
+containing `config` directory with `vendor.rb` file in it).
+Vendorfile is a Ruby file containing configuration settings and
+description of upstream vendor modules. It may also contain any custom
+Ruby code if needed.
+### Settings
+ * `basedir "subpath"` -- directory below work root where
+   Vendorificator will download modules. Defaults to `"vendor"`.
+ * `branch_prefix "prefix"` -- prefix for name of Git
+   branches. Defaults to `"vendor"`, which means all branches created
+   by Vendorificator start with `"vendor/"`.
+ * `remotes ['remote1', 'remote2', ...]` -- list of Git remotes that
+   `vendor pull` will use as default. Defaults to `['origin']`.
+ * `chef_cookbook_ignore_dependencies ['cookbook1', 'cookbook2', ...]`
+   -- default value for `:ignore_dependencies` argument of
+ `chef_cookbook` modules.
+### Modules
+A **vendor module** is a single piece of upstream code managed by
+Vendorificator. It is a basic building block. A vendor module is
+declared by calling one of a couple functions that define them.
+#### vendor
+Vendor is most general of those. You call it like this:
+```ruby
+vendor 'name', :option => 'value' do
+  # here in the block you code what needs to be done
+  # to get ("conjure") the module. You're already in
+  # the right directory, branch, etc, and what you add to the
+  # current directory will be committed and tagged.
+end
+```
+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
+   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
+   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
+All other upstream modules take these options, and can be given a
+block to postprocess their content (e.g. if a tarball includes a
+`.git` file/directory that confuses Git, you can remove it in a
+block).
+Example:
+```ruby
+vendor 'generated', :version => '0.23' do |mod|
+  File.open('README') { |f| f.puts "Hello, World!" }
+  File.open('VERSION') { |f| f.puts mod.version }
+end
+```
+#### archive
+Archive takes a tar.gz, tar.bz2, or zip file, downloads it, and
+unpacks it as contents of the module. It takes same options as
+`vendor`, plus:
+ * `:url` -- address from which to download the archive. If not given,
+   module's name will be used as URL, and its basename as module's
+   name (e.g. `archive
+   "http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz"` will be named
+   `"hello-2.8"` and downloaded from the URL).
+ * `:filename` -- a filename to download. Useful if URL doesn't
+   specify this nwell.
+ * `:type` -- `:targz`, `:tarbz2`, or `:zip`
+ * `:unpack` -- a command that will be used to unpack the file
+ * `:basename` -- defaults to basename of `filename`, will be used as
+   directory name
+ * `:no_strip_root` -- by default, if archive consists of a single
+   directory, Vendorificator will strip it. Setting this to true
+   disables this behaviour.
+ * `:checksum` -- if set to SHA256 checksum of the file, it will be
+   checked on download.
+Archive's `:version` defaults to file name.
+Example:
+```ruby
+    archive :hello,
+      :url => 'http://ftp.gnu.org/gnu/hello/hello-2.8.tar.gz',
+      :version => '2.8',
+      :checksum => 'e6b77f81f7cf7daefad4a9f5b65de6cae9c3f13b8cfbaea8cb53bb5ea5460d73'
+```
+#### git
+Downloads snapshot of a Git repository. Takes the same options as
+`vendor`, plus:
+ * `:repository` -- address of the repository. Defaults to name (and
+   sets name to its basename then), just like `:url` for `archive`
+   (e.g. `git "git://github.com/github/testrepo.git"` will be cloned
+   from that repository, and named `testrepo`).
+ * `:branch`, `:revision` -- what to check out when repository is
+   cloned.
+Git module's `:version` defaults to the conjured revision.
+Example:
+```ruby
+git 'git://github.com/mpasternacki/nagios.git',
+    :branch => 'COOK-1997',
+    :category => :cookbooks,
+    :version => '0.20130124.2'
+```
+#### chef_cookbook
+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
+arguments as `archive` (but the name and possibly version is almost
+always enough), plus:
+ * `:ignore_dependencies` -- if true, ignore dependencies
+   completely. If an array, don't download dependencies that are in
+   the array. Default for that is `chef_cookbook_ignore_dependencies`
+   setting.
+Examples:
+```ruby
+chef_cookbook 'apt'
+chef_cookbook 'memcached'
+chef_cookbook 'chef-server', :ignore_dependences => true
+```
+```ruby
+chef_cookbook_ignore_dependencies ['runit']
+chef_cookbook 'memcached'
+```
+```ruby
+chef_cookbook 'memcached', ignore_dependencies => ['runit']
+```
+If you get Chef cookbooks from Git or anywhere else than Opscode's
+community website, you can still use dependency resolution by mixing
+in the hook class:
+```ruby
+class <<  git 'git://github.com/user/cookbook.git', :category => :cookbooks
+  include Vendorificator::Hooks::ChefCookbookDependencies
+end
+```
+This is a bit convoluted, but there will soon be an argument to do
+that in a nicer way.
 ## Contributing

data/features/chef_cookbook.feature CHANGED Viewed

@@ -5,11 +5,9 @@ Scenario: A single cookbook, without dependencies
 Scenario: Version & checksum
   Given a repository with following Vendorfile:
     """ruby
-    require 'vendorificator/vendor/chef_cookbook'
     chef_cookbook 'apt'
     """
-  When I run "vendor"
+  When I run "vendor sync"
   Then following has been conjured:
     | Name      | cookbooks/apt |
     | With file | metadata.rb   |
@@ -17,11 +15,9 @@ Scenario: Version & checksum
 Scenario: Dependency hook
   Given a repository with following Vendorfile:
     """ruby
-    require 'vendorificator/vendor/chef_cookbook'
     chef_cookbook 'memcached'
     """
-  When I run "vendor"
+  When I run "vendor sync"
   Then following has been conjured:
     | Name      | cookbooks/memcached | cookbooks/runit |
     | With file | metadata.rb         | metadata.rb     |
@@ -29,16 +25,33 @@ Scenario: Dependency hook
 Scenario: Ignored dependency
   Given a repository with following Vendorfile:
     """ruby
-    require 'vendorificator/vendor/chef_cookbook'
     chef_cookbook_ignore_dependencies ['runit']
     chef_cookbook 'memcached'
     """
-  When I run "vendor"
+  When I run "vendor sync"
   Then following has been conjured:
     | Name      | cookbooks/memcached |
     | With file | metadata.rb         |
   And following has not been conjured:
     | Name      | cookbooks/runit |
     | With file | metadata.rb     |
+Scenario: Ignored all dependencies
+  Given a repository with following Vendorfile:
+    """ruby
+    chef_cookbook_ignore_dependencies true
+    chef_cookbook 'chef-server'
+    """
+  When I run "vendor sync"
+  Then following has been conjured:
+    | Name      | cookbooks/chef-server |
+    | With file | metadata.rb           |
+  And following has not been conjured:
+    | Name      | cookbooks/runit |
+    | With file | metadata.rb     |
+  And following has not been conjured:
+    | Name      | cookbooks/daemontools |
+    | With file | metadata.rb           |
+  And following has not been conjured:
+    | Name      | cookbooks/apache2 |
+    | With file | metadata.rb       |

data/features/fixtures/vcr_cassettes/vendorificator.yml CHANGED Viewed

@@ -2372,4 +2372,685 @@ http_interactions:
       string: ! '{"error_messages":["Resource does not exist"],"error_code":"NOT_FOUND"}'
     http_version: '1.1'
   recorded_at: Fri, 01 Feb 2013 18:47:12 GMT
+- request:
+    method: get
+    uri: http://cookbooks.opscode.com/api/v1/cookbooks/chef-server
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      accept:
+      - ! '*/*'
+      user-agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      server:
+      - nginx/1.0.5
+      date:
+      - Sat, 02 Feb 2013 18:10:19 GMT
+      content-type:
+      - application/json; charset=utf-8
+      connection:
+      - keep-alive
+      status:
+      - 200 OK
+      x-runtime:
+      - '120'
+      cache-control:
+      - private, max-age=0, must-revalidate
+      set-cookie:
+      - logged-in-username=; domain=.opscode.com; path=/
+      - _sandbox_session=eyJzZXNzaW9uX2lkIjoiNTZjNDY4ZWYwMzkyNzY3NDdjYWEzZGE3ODg2MzUxYjAiLCJsb2NhdGlvbiI6eyJhY3Rpb24iOiJzaG93IiwiaWQiOiJjaGVmLXNlcnZlciIsImNvbnRyb2xsZXIiOiJhcGkvdjEvY29va2Jvb2tzIn19--f8b9737a8b6006284bd4828f470097c4bb804cbd;
+        domain=.opscode.com; path=/; HttpOnly
+      content-length:
+      - '758'
+      etag:
+      - ! '"6ddf0a9e2de4ae6e63f2948aeb98b5f2"'
+    body:
+      encoding: US-ASCII
+      string: ! '{"maintainer":"opscode","updated_at":"2012-11-26T01:02:01Z","category":"Utilities","external_url":"github.com/opscode-cookbooks/chef-server","latest_version":"http://cookbooks.opscode.com/api/v1/cookbooks/chef-server/versions/1_1_0","created_at":"2011-05-03T13:54:53Z","average_rating":null,"name":"chef-server","versions":["http://cookbooks.opscode.com/api/v1/cookbooks/chef-server/versions/1_1_0","http://cookbooks.opscode.com/api/v1/cookbooks/chef-server/versions/1_0_0","http://cookbooks.opscode.com/api/v1/cookbooks/chef-server/versions/0_99_12","http://cookbooks.opscode.com/api/v1/cookbooks/chef-server/versions/0_99_11","http://cookbooks.opscode.com/api/v1/cookbooks/chef-server/versions/0_99_10"],"description":"Installs
+        and configures Chef Server"}'
+    http_version: '1.1'
+  recorded_at: Sat, 02 Feb 2013 18:10:20 GMT
+- request:
+    method: get
+    uri: http://cookbooks.opscode.com/api/v1/cookbooks/chef-server/versions/1_1_0
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      accept:
+      - ! '*/*'
+      user-agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      server:
+      - nginx/1.0.5
+      date:
+      - Sat, 02 Feb 2013 18:10:19 GMT
+      content-type:
+      - application/json; charset=utf-8
+      connection:
+      - keep-alive
+      status:
+      - 200 OK
+      etag:
+      - ! '"3f5257f87da094ff8a4a4a6d2ed82a07"'
+      set-cookie:
+      - logged-in-username=; domain=.opscode.com; path=/
+      - _sandbox_session=eyJzZXNzaW9uX2lkIjoiZTVhMTQwNTAzMjA5YWMyNDMxZDllOTJiMTA0MzY1NmEiLCJsb2NhdGlvbiI6eyJjb29rYm9va19pZCI6ImNoZWYtc2VydmVyIiwiY29udHJvbGxlciI6ImFwaS92MS9jb29rYm9va192ZXJzaW9ucyIsImlkIjoiMV8xXzAiLCJhY3Rpb24iOiJzaG93In19--94011b94ebf69c3bf33559b400e4b8316464c187;
+        domain=.opscode.com; path=/; HttpOnly
+      cache-control:
+      - private, max-age=0, must-revalidate
+      content-length:
+      - '362'
+      x-runtime:
+      - '131'
+    body:
+      encoding: US-ASCII
+      string: ! '{"tarball_file_size":24907,"version":"1.1.0","file":"http://s3.amazonaws.com/community-files.opscode.com/cookbook_versions/tarballs/2451/original/chef-server.tgz?1353891710","created_at":"2012-11-26T01:01:53Z","cookbook":"http://cookbooks.opscode.com/api/v1/cookbooks/chef-server","license":"Apache
+        2.0","average_rating":null,"updated_at":"2012-11-26T01:01:53Z"}'
+    http_version: '1.1'
+  recorded_at: Sat, 02 Feb 2013 18:10:20 GMT
+- request:
+    method: get
+    uri: http://s3.amazonaws.com/community-files.opscode.com/cookbook_versions/tarballs/2451/original/chef-server.tgz?1353891710
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      accept:
+      - ! '*/*'
+      user-agent:
+      - Ruby
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      x-amz-id-2:
+      - 8EyI7PGag1vh8CtWeHpxSMNMYua3ZOTXfblA27zkczQg6QNiAU1O1cWBbSZT1NBD
+      x-amz-request-id:
+      - 11511F2E851F7F7E
+      date:
+      - Sat, 02 Feb 2013 18:10:23 GMT
+      last-modified:
+      - Mon, 26 Nov 2012 01:02:06 GMT
+      etag:
+      - ! '"f5f46683f0fb341eaea7fee9bf2f7f57"'
+      accept-ranges:
+      - bytes
+      content-type:
+      - application/octet-stream
+      content-length:
+      - '24907'
+      server:
+      - AmazonS3
+    body:
+      encoding: ASCII-8BIT
+      string: !binary |-
+        H4sIAH6/slAAA+19+0PbRrbw/qy/YtZJF2htY94NbXqXAmnZTSALZNt+Sa4j
+        2zKoyJIryYDb5P7t33nNaCTL2CaEJK117zZYmseZM2fOa86ZaZ973VrixZde
+        vPy3D/Q0Go2tjQ1F/27yv43Vdf5XHrWy2thY31jb2tjaVI2V9c1G429q40MB
+        ZD+DJHVjAOXX1O+1vLjnhuXloFi3e0M7Mg7z72fytK35r5/5qX8WRrF3t30A
+        PjbX12+Y/7X1wvxvbmxu/E017haM8ucvPv/11iDsBJ5Tb7tACk79wk/h39Bp
+        +aHzsWGbPx/+sde/m6ax3xqkXnK3omB2/r+5tbk55//38djzv/vjzuEP+0+P
+        fqj3OnfZxwT+vwLsvjj/6yvrc/5/H8+DB+pypb5Sb2w7zpfq5e7R0b9rK5tr
+        W69VTe35sddOo3io2rHnpn4UKj9UFsWo5DwaBB3V8hSUHMSJf+nZrXyNrVjl
+        t9UzH9QL1Y2iTjsGZaOtuv71oJ+o0PM6Xsequ76GdXehrjrhvnaj6KIF/4M2
+        ksQPz9R+HLjwD4D0zEvdjpu6as/re2EnydrZ2qSRDBJP9QM37UZxr9l1e34w
+        LA6lLc07DqOkkUPJ140VbMftdJTbc38HTAR+OLjOvn+9qfsByan6bnoOLYaJ
+        n6RemAbDDCJQdrCkd913ww702woGXt8PAtWJvCRcSNW5e+mpjtd1B0GqLl34
+        DPiKVRh1PEdBo4MwZRgb9UeP6iurFpSwegjjUa/vtlPlQqvpuacufe8qw8mj
+        zUdY6A2Puxm6Pe+NAljMGzfw3cRL4GWCY+j6Z4PYbQWeyuSDAgS8Qew1ZWK3
+        wzM/vK714+h6KK3lPrt9VC/k+1yx+HSeHP8/Ojw9Pvj+xenB4Z2KgJv5/+pG
+        Y2utwP+3GuuNOf+/j+cB8NWQlzXy1DRSR/2kDbzG8NvEcX6CtR976ixwO2oY
+        DdSVG6ZYtK2reqUV/65Ogft0/ThJHeCDfeUnxI86XgKSBav4PeAIwO7wLfz1
+        K4ibuuP8Al203RBqAh/BT26YXHlxgjWAA/soidxAdWPvtwFxV+BUF15Hwa8E
+        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
+        W2OztqqqQhFh8C+VrCxxNTwFUhA7oRqW1LXwkoLpamFJU8vD288oAG38uPIl
+        NbrprawioqKRQya/fvT1GhTkY+7HrzP8LNtveE4LhuC1XTKbqdlx9jL8QBO5
+        YldC+/qmSvB9pA5OPdXB4rkvdK159uVjs9XP5pkg/7Pjnd6jjwnyv7G1ulKU
+        /6tb8/jfe3ky+Y+H7H9A6V8q5Ofc+r24tdv7rc8+sQpeUgiscGbON2H9X9Zy
+        GfA1mMqaHMI2fR+T1n9jvbj+N9ZX5/m/9/I8+DtGQy8n54537bVVcgkzDIpU
+        mqr6Mp4ROZekf+5nxvU/89rHZ9L6X18Zyf/c3Jiv/3t5svWPWRCPP4uMDWZV
+        q9/9Y4X/0qAse+Fl4XjpGU9s+etxu+nWv+x13kr630r+r8zl//08c/n/135m
+        Wv+3kv6T1//GanH/Z31tY57/dS/Pn1P+v/e5Dar2fHy9fJay7JF9QcnOnx27
+        nGn9k2t+di1gdvm/ubo+3/+7l2cu///azy3W/537/0bPf91Yn5//dD/Pn1n+
+        38EpfTPrAXKe3mejDUy5/vFC4lta/7eR/+ubjbn8v5dnLv//2s8M6/+W1v/k
+        9b+2tjZy/uPqfP//Xp4/qfwHep1zrmmeqeK/8cqxeufWYeCNmeO/Vzc35ve/
+        3Mszy/znttZmEAUT+P/66krx/MfNxuZc/7uXR/h/ywUJgBFf+e3TEzwScNCX
+        SxTz92/L1cAUquzFUvmC7zDcVjX1aEM1NuAl33tPl5tuq5Ncpez6SX2rnhWK
+        XnecBw8eqO/3fzg4VAeHB6fwnydH0ODzOLr0odXtPLDw5Vgu1KsR3NvqIYmu
+        ZjdRD0MvxTMj1cPY60Wph++MpFD6rmJZCPmWov77NHRyHg2CDCAMW+6oh5iz
+        bn+kPka+xWltL4e8GWZD7d0a7Yj1/cM9C+cIDl8n3R2EbBcHfit246FT5xxZ
+        4RD6c+KQZH6cRb7lLqp9/bICREe2c2X0hpeKA/b32ePC5TKO81LVutxbMkyY
+        zpYfYlH1GpMR66XfHId/PX74x+7R4ZODH2pZuLFhZXHrnQPmOuYOQLnnB3t4
+        WkhtLOza7q/kL1mBFt45QCgX0s7To91/U0PLly5pURfLyaAF8DFkWPbMFP3B
+        LnlWgC/A0nw/cAKlj57T/Yw1PO4ASWJxSTI6AUPX6iHpRK/V27fKu/ZTtaE/
+        ddVDxoX1cZNTUdvnEYZKPKwQieH9jATituJjMfnoU36naqCDtVVF2qqo2lP4
+        IUOpoL+k8lBwWYE/BWpuJ/bSSzd4/PB/TK8C20P+omreb6rB05nivea08Aif
+        uv4gDnVpOu4Blo4Zvj2MqN8fGcaFHwR4hCm6gzSMXGJm6OIe4XMCdHKmqjIQ
+        IrjyB7znIkHkdkwBqYFfYHm3veb47/F5E/5OB4n5+EABZSrOPcF7Qzteirds
+        hnTFvXXTLN4OCiXpHs6IruPl4F6/rbhFDSL8WYIru+/mbxlo+p36DvSHy+Vw
+        EASspEOFtgudVB6uVIAHZQhYcnSIq9Ugopdos2G+Plwxf37zjUFkeW1N2TfV
+        Fiwu3VgE8X5zF1s31KfZqxVbsed0dEjYfEmPxYJ4Hq+M4G0aD2sjo7kZHZqE
+        Cq1+mdWndfSw8iIBmwzkUkP9wZ0h0t9yy281AGOAectjfGuj4V0l6wFBWnW8
+        xG079Dcsuo+tCf01n5n1/5ybezobYJL+v7U5sv+71Zjv/9zLU6r/57ZPSrTO
+        kUIl2v+WaqyNav8UlkEHVY5RQkE9AjJMQEyk3pm+PT4GzRiV7mlNgjxotzIL
+        vFvbAfek+Y9O1KjS/77Y/liWgD2snDWQ/3D3FgFztfcyB3L8EXdQ7t4uyHVB
+        tgHuXiKoR8entfXGeuOd44WX8GL/8L8Hx0eHeCJiLdvUfOe4HbcPuiGU2Nnb
+        eX66f1xLz3143z73g44MHS2N3R8Pnu4JAk5uhQHeCH3nYOYmNHiyf/zf/ePm
+        C/iXdhbeOZS4mX354fjoxXP59ClZPLvjLZ4+WjwwARXcOq48BMxX1Cuj6pin
+        5sJHQbzYSTl0w7sBvENEwZ8/wJ+EmtK2MrtKVf6RqdufuJWl5mbW3MwqFpmb
+        WR/VzLql/j/TRvBE/X9lJP9jY3N9rv/fx3OD/j9B6yzR+WHq1sfo/B9c238P
+        9/8N2wizOP+LzdyfATBO9f8Mlf4Sdf9DKPrmYKv31vQ/qI5fpt03PgXtfq7X
+        m2eu18/1+rleP1Jkrtd/Ftsns+v/eCTUbGGgk/T/xubo/Q9rc///vTw5/V8Z
+        AwD12THhJnRQlISbeHQRS4klsK4amyOWwEjFfAjLbGE/FOI5o84/o25/P+E7
+        ZfgsaPNTIu6jae50V66tt9ML1Nq9u9Xa+Ti699HZ5TbhO1bW5Z7eT0u1/bMF
+        6czVzLmaOVJkrmZ+Fmrm/PlEn6nuf/gI+R9r8/P/7+WZZf4/TP7HCvwo5v9v
+        Ntbm9//dy/Pg70onAE4yu7JnUt4FCdtsi8SYVoX0iHGGHJpTt2pjj8nWBkOt
+        qjW1rjZyX00HoCiuqM1yc43tNeXmR1tmZdEZylF/GPtn56BGtpfUaqPxqLYK
+        pK2O+mDddLyqOgjb6tvAO3ODf0b8rt6Oet+VJN3oZ9yejwVK3ur+egOWTtHq
+        JkGfKGgn34sfaouhh7A4I/mfSSEB1Er9zKV9mkxQZ29n/9nR4ePb5Hw4eDfr
+        4/yrvf2T3cIrsfbGdzE+NcNx8Ihksr0YTkvpQmMY7OLlIGkRr6tZ5jDYZDEb
+        qpopPkRYcyZs7ovjgB7/Uv0dbbDp4FSvv0HFH1Xu3gUehT1dNQcXYnQFtgxu
+        u2w/pC2Waet2fUfmqwmW6snjCluMD9nmRgvxoSAbbceHYvfC9x/3nzT3f36+
+        c7i3f9zcOf7hBAx9MVOagGYxNOCvx6Ruo1fk8UO8WRkQ+TubnRWxztgSW6Fv
+        hK5lNPyWsQiXsIu0e53Hb9puahVahncBGk5vVRqrhVfAdxfgn3ABXrhXF2rh
+        8Pjx49WFN9QB2MI96Pnvj+EvBKoy2oX82SDbiYckwyH4ulBTcDI6AhwwgaeL
+        YK8WXsg8s0lvTL+0XGXWpHMiJ8Id18bZRgAM0Yid1pT1jLagnjvd4UNrrh26
+        HA05EFvRXpB4WSs1tB9quqkam8a1GjBnD/81RqbuQe9i1Wrt80E2RATS+kbu
+        Dg1MrVaEpwAREGdmqMsX7UjI42Ya5ORdCgXMcIlc7xlCxmAk6k+DEPhG11WU
+        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
+        5s/8mT/zZ/7Mn8/5+f8QS8V/ADACAA==
+    http_version: '1.1'
+  recorded_at: Sat, 02 Feb 2013 18:10:23 GMT
 recorded_with: VCR 2.3.0

data/features/git.feature CHANGED Viewed

@@ -5,7 +5,7 @@ Scenario:
     """ruby
     git "file://#{ENV['FIXTURES_DIR']}/git/testrepo"
     """
-  When I run "vendor"
+  When I run "vendor sync"
   Then following has been conjured:
     | Name      | testrepo                                 |
     | Version   | 10e9ac58c77bc229d8c59a5b4eb7422916453148 |

data/features/needed.feature CHANGED Viewed

@@ -6,11 +6,11 @@ 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"
+  When I run "vendor sync"
   Then I'm on "master" branch
   And command output includes /module\s+testrepo/
   And command output includes "testrepo-0.1.tar.gz"
-  Then I run "vendor"
+  Then I run "vendor sync"
   And command output includes /module\s+testrepo/
   And command output includes /up to date\s+testrepo/
   And command output does not include "testrepo-0.1.tar.gz"

data/features/status.feature CHANGED Viewed

@@ -16,12 +16,12 @@ Scenario: status new module
   Then command output includes /new\s+generated\/0.23/
 Scenario: status up-to-date module
-  When I run "vendor"
+  When I run "vendor sync"
   And I run "vendor status"
   Then command output includes /up to date\s+generated\/0.23/
 Scenario: status outdated modules
-  When I run "vendor"
+  When I run "vendor sync"
   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 status"
   Then command output includes /new\s+memcached/
   And command output does not include "runit"
-  When I run "vendor"
+  When I run "vendor sync"
   And I run "vendor status"
   Then command output includes /up to date\s+memcached/
   And command output includes /up to date\s+runit/

data/features/tarball.feature CHANGED Viewed

@@ -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"
+  When I run "vendor sync"
   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"
+  When I run "vendor sync"
   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"
+  When I run "vendor sync"
   Then following has been conjured:
     | Name      | testrepo     |
     | Version   | 0.1          |
@@ -45,7 +45,7 @@ Scenario: Wrong checksum
       :version => '0.1',
       :checksum => 'incorrect'
     """
-  When I try to run "vendor"
+  When I try to run "vendor sync"
   Then the command has failed
   Then following has not been conjured:
     | Name      | testrepo     |
@@ -57,7 +57,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"
+  When I run "vendor sync"
   Then following has been conjured:
     | Name      | testrepo     |
     | With file | test/alias.c |

data/features/tarball_edit.feature CHANGED Viewed

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

data/features/vendor.feature CHANGED Viewed

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

data/lib/vendorificator/cli.rb CHANGED Viewed

@@ -9,7 +9,7 @@ module Vendorificator
     check_unknown_options! :except => [:git, :diff, :log]
     stop_on_unknown_option! :git, :diff, :log
-    default_task :sync
+    default_task :help
     class_option :file, :aliases => '-f', :type => :string, :banner => 'PATH'
     class_option :debug, :aliases => '-d', :type => :boolean, :default => false

data/lib/vendorificator/config.rb CHANGED Viewed

@@ -9,7 +9,6 @@ module Vendorificator
     extend Mixlib::Config
     configure do |c|
-      c[:root] = Pathname.getwd
       c[:basedir] = 'vendor'
       c[:branch_prefix] = 'vendor'
       c[:modules] = []
@@ -27,7 +26,6 @@ module Vendorificator
           pathname.dirname
         end
       self[:vendorfile_path] = pathname
-      self[:lockfile_path] = pathname.dirname.join(pathname.basename.to_s + '.lock')
       super(pathname.to_s)
     end

data/lib/vendorificator/hooks/chef_cookbook.rb CHANGED Viewed

@@ -1,10 +1,16 @@
-require 'chef/cookbook/metadata'
 module Vendorificator::Hooks
   module ChefCookbookDependencies
+    def initialize(*args)
+      require 'chef/cookbook/metadata'
+      super
+    end
     # Add required Chef cookbooks to vendor modules
     def dependencies
-      ignored = Vendorificator::Config[:chef_cookbook_ignore_dependencies] || []
+      ignored =
+        args.key?(:ignore_dependencies) ?
+          args[:ignore_dependencies] :
+            Vendorificator::Config[:chef_cookbook_ignore_dependencies]
       metadata = File.join(self.work_dir, 'metadata.rb')
       unless File.exist?(metadata)
@@ -15,9 +21,16 @@ module Vendorificator::Hooks
       cbmd = Chef::Cookbook::Metadata.new
       cbmd.from_file(metadata)
-      super + cbmd.dependencies.
-        reject { |name, version| ignored.include?(name) }.
-        map { |name, version| Vendorificator::Vendor::ChefCookbook.new(name) }
+      if ignored && !ignored.respond_to?(:include?)
+        # ignored is a truthy value that's not a set-like thing, so we
+        # ignore all dependencies altogether.
+        super
+      else
+        deps = cbmd.dependencies.map(&:first)
+        deps.reject! { |n| ignored.include?(n) } if ignored.respond_to?(:include?)
+        deps.map! { |n| Vendorificator::Vendor::ChefCookbook.new(n) }
+        super + deps
+      end
     end
   end
 end

data/lib/vendorificator/vendor.rb CHANGED Viewed

@@ -32,7 +32,7 @@ module Vendorificator
       end
     end
-    attr_reader :config, :name, :args, :block
+    attr_reader :name, :args, :block
     arg_reader :version, :path
     def path
@@ -40,6 +40,8 @@ module Vendorificator
     end
     def initialize(name, args={}, &block)
+      @category = args.delete(:category)
       @name = name
       @args = args
       @block = block
@@ -51,7 +53,7 @@ module Vendorificator
     end
     def category
-      self.class.category
+      @category || self.class.category
     end
     def branch_name

data/lib/vendorificator/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module Vendorificator
-  VERSION = "0.0.1"
+  VERSION = "0.1.0"
 end

data/lib/vendorificator.rb CHANGED Viewed

@@ -7,3 +7,4 @@ require 'vendorificator/config'
 require 'vendorificator/vendor'
 require 'vendorificator/vendor/archive'
 require 'vendorificator/vendor/git'
+require 'vendorificator/vendor/chef_cookbook'

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: vendorificator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease:
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-02-02 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: escape
@@ -266,7 +266,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1339257298363592646
+      hash: 4082258902042132214
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -275,7 +275,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 1339257298363592646
+      hash: 4082258902042132214
 requirements: []
 rubyforge_project:
 rubygems_version: 1.8.24