projit 0.4.0 → 0.5.0

data/Changelog.markdown

@@ -0,0 +1,14 @@
+v0.5.0 / 2011-11-23
+
+Enhancements
+
+- Create empty project directories as part of DSL
+- DSL to specify project subdirectories
+
+Changes
+
+- Remove option to symlink to Dropbox from CLI
+  - To symlink to Dropbox call `create_link_in_dropbox` in your template
+- Make type an argument instead of an option
+  - Type is now specified after new
+  - It defaults to template if not specified

data/README.markdown

@@ -18,10 +18,14 @@ This will run the recipe you have installed in `~/.projit/template.rb`. To get t
 
 This will run the same recipe but also clone the specified git repository (assuming you have `clone_from_git` in your recipe).
 
-    projit new personal/projit\_demo --type screencast
+    projit new screencast personal/projit_demo
 
 Runs the recipe stored in `~/.projit/screencast.rb` to setup a directory structure for screencasting. To get the generator that I use for screencasting download [this gist][screencasting] (structure stolen from @topfunky).
 
+## Templates
+
+Projit makes a few methods available to you to assist you in creating your directory structure. Use `project_name` to get access to the name you specified at the command line. `create_project_directory` will create the directory specified by "name" at your project root; its counterpart `create_project_subdirs` will create the directories you specified by calling `project_subdirs` under the project. Finally, `create_link_in_dropbox` will symlink your project to Dropbox (add a `dropbox_home` option to ~/.projit/config).
+
 ## Contributions
 
 Contributions are encouraged, but given the very personal nature of workflows don't be suprised if I prefer creating recipes over adding to projit itself. Feel free to send pull requests though, it's the only way for me to see how other people use this. I will not accept Ruby code without spec coverage.

data/lib/projit/cli.rb

@@ -4,9 +4,9 @@ require 'projit'
 module Projit
   class CLI < Thor
 
-    desc "new NAME", "Create project named NAME under current directory or CLIENT if specified"
-    class_options dropbox: false, git: nil, type: nil
-    def new(name)
+    desc "new TYPE NAME", "Create project named NAME under current directory using the template specified by TYPE"
+    class_options git: nil
+    def new(type, name=nil)
       args = ARGV.reject { |a| a == "new" }
       Projit::ProjectGenerator.start args
     end

data/lib/projit/project_generator.rb

@@ -9,19 +9,34 @@ module Projit
 
     source_root "~/.projit"
 
-    argument :project
-    class_options dropbox: false, git: nil
-    class_option :type, default: "template"
+    argument :type, default: "template"
+    argument :project, required: false
+    class_options git: nil
 
     def new
       apply projit_template
     end
 
-
     protected
 
     def projit_template
-      "#{options[:type]}.rb"
+      "#{template_name}.rb"
+    end
+
+    def create_project_directory
+      in_project_root do
+        empty_directory project_name
+      end
+    end
+
+    def project_subdirs(subdirs)
+      @project_subdirs = subdirs
+    end
+
+    def create_project_subdirs
+      in_project_directory do
+        @project_subdirs.each { |d| empty_directory d }
+      end
     end
 
     def in_project_root(&block)
@@ -29,11 +44,10 @@ module Projit
     end
 
     def in_project_directory(&block)
-      inside projects_home_path.join(project), &block
+      inside projects_home_path.join(project_name), &block
     end
 
     def create_link_in_dropbox(name)
-      return unless options[:dropbox]
       unless dropbox_configured?
         say "How can I create a link to your Dropbox if you haven't told me where in your Dropbox to create it? Please add a value for 'dropbox_home' to ~/.projit/config."
         return
@@ -57,11 +71,19 @@ module Projit
     end
 
     def project_path
-      Pathname.new project
+      Pathname.new project_name
+    end
+
+    def project_name
+      project || type
+    end
+
+    def template_name
+      (project && type) || "template"
     end
 
     def project_full_path
-      projects_home_path.join(project)
+      projects_home_path.join(project_name)
     end
 
     def project_base

data/lib/projit/version.rb

@@ -1,3 +1,3 @@
 module Projit
-  VERSION = "0.4.0"
+  VERSION = "0.5.0"
 end

data/spec/projit/project_generator_spec.rb

@@ -20,12 +20,6 @@ describe Projit::ProjectGenerator do
       subject.stub :create_link
     end
 
-    it "Skips linking with Dropbox when option is not supplied" do
-      (subject.stub :options).and_return dropbox: false
-      subject.should_not_receive :create_link
-      subject.send :create_link_in_dropbox, "test"
-    end
-
     context "with Dropbox configured" do
 
       before do
@@ -108,10 +102,14 @@ describe Projit::ProjectGenerator do
   end
 
   context "support project types" do
-    it "uses type parameter to find the template script" do
-      subject.stub(options: { type: "web_application" })
+    it "uses type argument to find the template script" do
+      subject.stub(type: "web_application")
       subject.send(:projit_template).should eq "web_application.rb"
     end
+    it "uses type argument for project name if name isn't specified" do
+      subject.stub(type: "project", name: nil)
+      subject.send(:project_name).should eq "project"
+    end
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: projit
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-03 00:00:00.000000000Z
+date: 2011-11-23 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70287568473380 !ruby/object:Gem::Requirement
+  requirement: &70232051991160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70287568473380
+  version_requirements: *70232051991160
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70287568472960 !ruby/object:Gem::Requirement
+  requirement: &70232051990620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70287568472960
+  version_requirements: *70232051990620
 description: Generate project directory structure based on a switchable template.
 email:
 - joe@joefiorini.com
@@ -44,6 +44,7 @@ files:
 - .gitignore
 - .rbenv-gemsets
 - .rvmrc
+- Changelog.markdown
 - Gemfile
 - README.markdown
 - Rakefile