librarian 0.0.4 → 0.0.5

data/README.md

@@ -14,19 +14,29 @@ Librarian::Chef
 
 An adapter for Librarian applying to Chef cookbooks in a Chef Repository.
 
-Usage:
+## Install librarian:
 
-    # install librarian onto your system
     $ gem install librarian
 
-    $ cd ~/path/to/chef-repo
 
-    # make sure your cookbooks directory exists but is gitignored
+__Make sure your cookbooks directory is gitignored__
+
+    $ cd ~/path/to/chef-repo
     $ git rm -r cookbooks # if the directory is present
-    $ mkdir cookbooks
     $ echo cookbooks >> .gitignore
 
-    # put dependencies and their sources into Cheffile
+Note that librarian *takes over* your cookbooks directory
+  and manages it for you based on your Cheffile. Your
+  Cheffile becomes the authoritative source for what
+  cookbooks you have, rather than the directories in your
+  cookbooks directory.
+
+__Make a Cheffile__
+
+    $ librarian-chef init
+
+__Add dependencies and their sources to Cheffile__
+
     $ cat Cheffile
         site 'http://community.opscode.com/api/v1'
         cookbook 'ntp'
@@ -35,14 +45,17 @@ Usage:
           :git => 'https://github.com/fnichol/chef-rvm',
           :ref => 'v0.7.1'
 
-    # install dependencies into ./cookbooks
+__install dependencies into ./cookbooks__
+
     $ librarian-chef install [--clean] [--verbose]
 
-    # check into version control your ./Cheffile.lock
+__Check your Cheffile.lock into version control__
+
     $ git add Cheffile.lock
     $ git commit -m "I want these particular versions of these particular cookbooks from these particular."
 
-    # update your cheffile with new/changed/removed constraints/sources/dependencies
+__Update your cheffile with new/changed/removed constraints/sources/dependencies__
+
     $ cat Cheffile
         site 'http://community.opscode.com/api/v1'
         cookbook 'ntp'
@@ -58,16 +71,19 @@ Usage:
     $ git add Cheffile.lock
     $ git commit -m "I also want these additional cookbooks."
 
-    # update the version of a dependency
+__Update the version of a dependency__
+
     $ librarian-chef update ntp timezone monit [--verbose]
     $ git diff Cheffile.lock
     $ git add Cheffile.lock
     $ git commit -m "I want updated versions of these cookbooks."
 
-    # push your changes to the git repository
+__Push your changes to the git repository__
+
     $ git push origin master
 
-    # upload the cookbooks to your chef-server
+__Upload the cookbooks to your chef-server__
+
     $ knife cookbook upload --all
 
 You should `.gitignore` your `./cookbooks` directory.
@@ -88,6 +104,11 @@ In the above, make sure *not* to include the path to your `chef-repo/cookbooks`.
   not have any `:path`-sourced cookbooks in your `Cheffile` sourced from that directory,
   you still need to include your `chef-repo/site-cookbooks` directory in the above list.
 
+What this integration does is when you use `knife`, it will enforce that your `Cheffile`
+  and `Cheffile.lock` are in sync. When you `knife cookbook upload`, it will be sure to
+  upload the same cookbook as is in your `Cheffile.lock`, regardless of what you've done
+  to your `chef-repo/cookbooks` directory.
+
 License
 -------
 

data/features/chef/cli/init.feature

@@ -0,0 +1,10 @@
+Feature: cli/init
+
+
+
+  Scenario: Initing a directory
+    When I run `librarian-chef init`
+    Then a file named "Cheffile" should exist
+
+
+

data/features/chef/cli/install.feature

@@ -1,4 +1,4 @@
-Feature: cli/catalog
+Feature: cli/install
 
 
 
@@ -19,7 +19,7 @@ Feature: cli/catalog
       cookbook 'apt',
         :path => 'cookbook-sources'
       """
-    When I run "librarian-chef install --verbose"
+    When I run `librarian-chef install --verbose`
     Then the exit status should be 0
     And the file "cookbooks/apt/metadata.yaml" should contain exactly:
       """
@@ -49,7 +49,7 @@ Feature: cli/catalog
       path 'cookbook-sources'
       cookbook 'main'
       """
-    When I run "librarian-chef install --verbose"
+    When I run `librarian-chef install --verbose`
     Then the exit status should be 0
     And the file "cookbooks/main/metadata.yaml" should contain exactly:
       """

data/lib/librarian/chef/cli.rb

@@ -1,3 +1,5 @@
+require 'librarian/helpers'
+
 require 'librarian/cli'
 require 'librarian/chef'
 require 'librarian/chef/particularity'
@@ -9,6 +11,12 @@ module Librarian
       include Particularity
       extend Particularity
 
+      source_root Pathname.new(__FILE__).dirname.join("templates")
+
+      def init
+        copy_file root_module.specfile_name
+      end
+
     end
   end
 end

data/lib/librarian/chef/templates/Cheffile

@@ -0,0 +1,13 @@
+#!/usr/bin/env ruby
+#^syntax detection
+
+site 'http://community.opscode.com/api/v1'
+
+# cookbook 'chef-client'
+
+# cookbook 'rvm',
+#   :git => 'https://github.com/fnichol/chef-rvm'
+
+# cookbook 'postgresql',
+#   :git => 'https://github.com/findsyou/cookbooks',
+#   :ref => 'postgresql-improvements'

data/lib/librarian/cli.rb

@@ -72,5 +72,10 @@ module Librarian
       end
     end
 
+    desc "init", "Initializes the current directory."
+    def init
+      puts "Nothing to do."
+    end
+
   end
 end

data/lib/librarian/version.rb

@@ -1,3 +1,3 @@
 module Librarian
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

data/lib/librarian.rb

@@ -105,6 +105,7 @@ module Librarian
     manifests.each do |manifest|
       manifest.source.cache!([manifest])
     end
+    install_path.mkpath unless install_path.exist?
     manifests.each do |manifest|
       manifest.install!
     end

data/librarian.gemspec

@@ -26,5 +26,5 @@ Gem::Specification.new do |s|
   s.add_development_dependency "aruba"
   s.add_development_dependency "webmock"
 
-  s.add_development_dependency "chef", ">= 0.10"
+  s.add_dependency "chef", ">= 0.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: librarian
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-08-08 00:00:00.000000000Z
+date: 2011-08-17 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &18652040 !ruby/object:Gem::Requirement
+  requirement: &25703580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *18652040
+  version_requirements: *25703580
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &18651500 !ruby/object:Gem::Requirement
+  requirement: &25703120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18651500
+  version_requirements: *25703120
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &18651020 !ruby/object:Gem::Requirement
+  requirement: &25702660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18651020
+  version_requirements: *25702660
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &18650380 !ruby/object:Gem::Requirement
+  requirement: &25702220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18650380
+  version_requirements: *25702220
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &18649560 !ruby/object:Gem::Requirement
+  requirement: &25701800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,18 +65,18 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18649560
+  version_requirements: *25701800
 - !ruby/object:Gem::Dependency
   name: chef
-  requirement: &18647940 !ruby/object:Gem::Requirement
+  requirement: &25701280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0.10'
-  type: :development
+  type: :runtime
   prerelease: false
-  version_requirements: *18647940
+  version_requirements: *25701280
 description: Librarian
 email:
 - y_feldblum@yahoo.com
@@ -95,6 +95,7 @@ files:
 - bin/librarian-chef
 - bin/librarian-mock
 - config/cucumber.yaml
+- features/chef/cli/init.feature
 - features/chef/cli/install.feature
 - features/support/env.rb
 - lib/librarian.rb
@@ -110,6 +111,7 @@ files:
 - lib/librarian/chef/source/local.rb
 - lib/librarian/chef/source/path.rb
 - lib/librarian/chef/source/site.rb
+- lib/librarian/chef/templates/Cheffile
 - lib/librarian/cli.rb
 - lib/librarian/dependency.rb
 - lib/librarian/dsl.rb