puppetry_toolbox 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 728dd6cf900292d60d1ab928de71d2d4ad72779d
-  data.tar.gz: c5f205bfd548448e2e28cd8836707f984855f5cc
+  metadata.gz: 2d6648354d4386e03c4d382bac0e88e612e3e3c7
+  data.tar.gz: de74d6251ae3c93d93404649808a6bb7ad9b6d60
 SHA512:
-  metadata.gz: b9215068d3e3b4f80530825be51a9cc3a94300a8ae496d96f7bddfe61e0aa5e83fb110511ba5e04d94572989545fe66ac641eef59ca4d0283ba23b8ee3822988
-  data.tar.gz: 128342723db841153416165b5e5f485a0e519c00c174761af2a82a184f51c899c5bd65b0f6bef7693d16f6b2f111c513bf90a9657c59cdc910fcef2eee074582
+  metadata.gz: 809c7654c522771faa47721c6db158027e7621194877afef2e8549111be6140df70e3188318838f2fade27cd79f9045ee72f2d001689c2b3c662de7795af38c7
+  data.tar.gz: 3a507a31ed1bc4f12b48a71ddf540dd9748abee3e8b83526f098bca09f45554ac75bad6435db2e23b598e52f1c29397310d2a0c3d7a922330a3e46597b63e560

data/.gitignore

@@ -5,3 +5,4 @@ Gemfile.lock
 .bundle
 vendor
 pkg
+coverage

data/README.md

@@ -7,14 +7,14 @@
 [![Coverage Status](https://coveralls.io/repos/stefanozanella/puppetry/badge.png?branch=master)](https://coveralls.io/r/stefanozanella/puppetry?branch=master)
 ## Installation
 Puppetry is currently shipped as a gem, so you just need to install it with:
-~~~
+```
 $ gem install puppetry_toolbox
-~~~
+```
 or, if you're using Bundler, set the following dependency line in your
 `Gemfile`:
-~~~
+```
 gem 'puppetry_toolbox'
-~~~
+```
 
 ## Usage
 Puppetry can help you with the development of a Puppet module in many ways.
@@ -29,9 +29,16 @@ Since this is almost all repeatable stuff, Puppetry ships with a command to
 generate the scaffolding for a new module.
 
 Let's pretend you want to start working on the `my_nice_module` module; then you just need to:
-~~~
+```
 puppetry new my_nice_module
-~~~
+```
 This will generate a `my_nice_module` subdirectory in the current working
 directory. This directory will contain everything you need to start developing
 your new module.
+
+### Adding a new test
+```
+$ puppetry test new_class
+$ puppetry test -c new_class
+$ puppetry test --class new_class
+```

data/lib/puppetry/cli.rb

@@ -2,12 +2,13 @@ require 'thor'
 require 'grit'
 require 'fileutils'
 require 'puppetry/version'
+require 'bundler'
 
 module Puppetry
   class CLI < Thor
     desc "version", "Print application's version"
     def version
-      puts "Puppetry v#{Puppetry::Version}"
+      output.puts "Puppetry v#{Puppetry::Version}"
     end
 
     desc "new NAME", "Create a new module called NAME"
@@ -22,5 +23,23 @@ module Puppetry
         end
       end
     end
+    
+    no_commands do
+      ##
+      # Overrides the default output stream (`$stdout`) used by the
+      # application. Useful for testing.
+      #
+      # param output [IO] An IO object that will receive the CLI standard
+      # output
+      def output=(output)
+        @output = output
+      end
+  
+      private
+
+      def output
+        @output || $stdout
+      end
+    end
   end
 end

data/lib/puppetry/version.rb

@@ -1,3 +1,3 @@
 module Puppetry
-  Version = VERSION = '0.0.3'.freeze
+  Version = VERSION = '0.0.4'.freeze
 end

data/test/end_to_end/puppetry_test.rb

@@ -4,47 +4,42 @@ require 'tmpdir'
 require 'fileutils'
 
 describe "puppetry" do
+  let(:module_dir) { "test_module" }
+  let(:out) { StringIO.new }
+  let(:working_dir) { Dir.mktmpdir }
+  let(:cli) { Puppetry::CLI.new }
+
   before do
-    @orig_stdout = $stdout
-    $stdout = StringIO.new
+    cli.output = out
   end
 
   after do
-    $stdout = @orig_stdout
+    FileUtils.remove_entry_secure working_dir
   end
 
   describe "version" do
     it "shows the application's version" do
-      Puppetry::CLI.start(["version"])
-      $stdout.string.must_match(/#{Puppetry::VERSION}/)
+      cli.version
+      out.string.must_match(/#{Puppetry::VERSION}/)
     end
   end
 
   describe "new" do
-    it "creates a new module starting from a scaffolded one" do
-      Dir.mktmpdir do |dir|
-        FileUtils.cd(dir) do
-          Puppetry::CLI.start(["new", "test_module"])
-
-          # test_module should exist and not be empty
-          assert Dir.exists?("test_module"), "Module folder test_module wasn't created"
-          Dir.entries("test_module").wont_be_empty
-          # test_module should contain at least the manifests folder
-          Dir.entries("test_module").must_include "manifests"
-          # test_module should not be a git repo (for the moment)
-          Dir.entries("test_module").wont_include ".git"
-        end
-      end
+    before do
+      @old_pwd = FileUtils.pwd
+      FileUtils.cd(working_dir)
+
+      cli.new module_dir
     end
 
-    it "runs bundler to install deps after folder initialization" do
-      Dir.mktmpdir do |dir|
-        FileUtils.cd(dir) do
-          Puppetry::CLI.start(["new", "test_module_setup"])
+    after do
+      FileUtils.cd @old_pwd
+    end
 
-          assert Dir.entries("test_module_setup").must_include ".bundle"
-        end
-      end
+    it "creates a new module starting from a scaffolded one" do
+      module_dir.must_contain_a_puppet_module
+      module_dir.wont_be_a_git_repository
+      assert_bundler_is_initialized_in  module_dir
     end
   end
 end

data/test/lib/puppetry/test.rb

@@ -0,0 +1 @@
+require 'puppetry/test/custom_assertions'

data/test/lib/puppetry/test/custom_assertions.rb

@@ -0,0 +1,20 @@
+module MiniTest::Assertions
+  def assert_contains_a_puppet_module(dir)
+    assert Dir.exists?(dir), "Module folder #{dir} wasn't created"
+    Dir.entries(dir).wont_be_empty
+    Dir.entries(dir).must_include "manifests"
+  end 
+
+  def refute_git_repository(dir)
+    Dir.entries(dir).wont_include ".git"
+  end
+
+  def assert_bundler_is_initialized_in(dir)
+    assert Dir.entries(dir).include?(".bundle"), "Bundler hasn't been initialized in folder #{dir}"
+  end
+end
+
+module MiniTest::Expectations
+  infect_an_assertion :assert_contains_a_puppet_module, :must_contain_a_puppet_module, :only_one_argument
+  infect_an_assertion :refute_git_repository, :wont_be_a_git_repository, :only_one_argument
+end

data/test/test_helper.rb

@@ -1,3 +1,5 @@
+$: << File.join(File.dirname(__FILE__), 'lib')
+
 require 'coveralls'
 Coveralls.wear!
 
@@ -5,4 +7,5 @@ require 'minitest/autorun'
 require 'minitest/pride'
 require 'minitest/spec'
 
+require 'puppetry/test'
 require 'puppetry'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: puppetry_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Stefano Zanella
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-21 00:00:00.000000000 Z
+date: 2013-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -104,6 +104,8 @@ files:
 - lib/puppetry/version.rb
 - puppetry.gemspec
 - test/end_to_end/puppetry_test.rb
+- test/lib/puppetry/test.rb
+- test/lib/puppetry/test/custom_assertions.rb
 - test/test_helper.rb
 homepage: https://github.com/stefanozanella/puppetry
 licenses: []
@@ -131,4 +133,6 @@ specification_version: 4
 summary: Puppetry is a CLI tool to aid Puppet modules development.
 test_files:
 - test/end_to_end/puppetry_test.rb
+- test/lib/puppetry/test.rb
+- test/lib/puppetry/test/custom_assertions.rb
 - test/test_helper.rb