puppetry_toolbox 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2d6648354d4386e03c4d382bac0e88e612e3e3c7
-  data.tar.gz: de74d6251ae3c93d93404649808a6bb7ad9b6d60
+  metadata.gz: 03fd1542bb8b18110ac356393ce59f3f6ab563d0
+  data.tar.gz: e828268fe9f59f82498051145f6795dfa30266db
 SHA512:
-  metadata.gz: 809c7654c522771faa47721c6db158027e7621194877afef2e8549111be6140df70e3188318838f2fade27cd79f9045ee72f2d001689c2b3c662de7795af38c7
-  data.tar.gz: 3a507a31ed1bc4f12b48a71ddf540dd9748abee3e8b83526f098bca09f45554ac75bad6435db2e23b598e52f1c29397310d2a0c3d7a922330a3e46597b63e560
+  metadata.gz: 2d4890f0fd0f9223e5abe7ca9dcc7d486255092c3d89aa0d2421d8c7790ea7c6be6c7b14ea13372c449d5c1db74b080d0266e362c78224bfb2c5ecca0b7297ea
+  data.tar.gz: ac4080ca69e1aa247d4b35c8996d3847ddd30f0b6ae55c1a25e0eb6c0495de218e2e9c715504bd74926f23ebb81262125ab0ab999480c39698a46fad4750f6ba

data/.ruby-version

@@ -1 +1 @@
-2.0.0-p0
+2.0.0-p195

data/README.md

@@ -36,9 +36,13 @@ 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
+In particular, created directory will be a Git repository tracking a remote
+named `skeleton` that points to the skeleton module used to scaffold the newly
+created one. So, it's possible to update the current scaffolding configuration
+by simply issuing:
 ```
-$ puppetry test new_class
-$ puppetry test -c new_class
-$ puppetry test --class new_class
+git pull skeleton master
 ```
+
+**NOTE**: This could lead to conflicts if you modify any of the files tracked
+by the skeleton module. Normal git housekeeping apply here though.

data/lib/puppetry/cli.rb

@@ -13,11 +13,12 @@ module Puppetry
 
     desc "new NAME", "Create a new module called NAME"
     def new(name)
-      Grit::Git.new(name).clone({}, "git://github.com/stefanozanella/puppet-skeleton", name)
-      # This looks rather rough, but maybe it's the simplest way to erase all
-      # git history from the folder?
+      repo = Grit::Repo.init(name)
+      repo.remote_add 'skeleton', 'https://github.com/stefanozanella/puppet-skeleton'
       FileUtils.cd name do
-        FileUtils.rm_rf File.expand_path('.git', '.')
+        # No support for push/pull in Grit?
+        `git pull skeleton master`
+
         Bundler.with_clean_env do
           system "bundle install --path vendor/bundle"
         end

data/lib/puppetry/version.rb

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

data/test/end_to_end/puppetry_test.rb

@@ -38,7 +38,8 @@ describe "puppetry" do
 
     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
+      module_dir.must_be_a_git_repository
+      module_dir.must_track_remote "skeleton"
       assert_bundler_is_initialized_in  module_dir
     end
   end

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

@@ -1,3 +1,5 @@
+require 'grit'
+
 module MiniTest::Assertions
   def assert_contains_a_puppet_module(dir)
     assert Dir.exists?(dir), "Module folder #{dir} wasn't created"
@@ -5,16 +7,21 @@ module MiniTest::Assertions
     Dir.entries(dir).must_include "manifests"
   end 
 
-  def refute_git_repository(dir)
-    Dir.entries(dir).wont_include ".git"
+  def assert_is_git_repository(dir)
+    assert Dir.entries(dir).include?(".git"), "Expected directory #{dir} to be a git repository"
+  end
+
+  def assert_tracks_remote(dir, remote)
+    assert Grit::Repo.new(dir).git.remote.split.include?(remote), "Expected repo #{dir} to track remote #{remote}"
   end
 
   def assert_bundler_is_initialized_in(dir)
-    assert Dir.entries(dir).include?(".bundle"), "Bundler hasn't been initialized in folder #{dir}"
+    assert Dir.entries(dir).include?(".bundle"), "Expected Bundler to be 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
+  infect_an_assertion :assert_is_git_repository, :must_be_a_git_repository, :only_one_argument
+  infect_an_assertion :assert_tracks_remote, :must_track_remote, :do_not_flip
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: puppetry_toolbox
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Stefano Zanella