project 1.1.0 → 1.2.0

data/.gitignore

@@ -1 +1,2 @@
 pkg/*
+.gem

data/Rakefile

@@ -1,44 +1,22 @@
-require 'rubygems'
-require 'rake'
+# Quick task to build and deploy gem.
+require 'lib/project'
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "project"
-    gem.summary = "A streamlined approach to working with multiple projects and tasks."
-    gem.description = "Project aims to make working with multiple projects as simple as possible. By registering projects with workflows you can quickly create a set of commands that will be run against each project."
-    gem.email = "josh@josh-nesbitt.net"
-    gem.homepage = "http://github.com/joshnesbitt/project"
-    gem.authors = ["Josh Nesbitt"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.executables << 'project'
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+GEM_NAME = "project-#{Project::Version::STRING}.gem"
+GEM_PATH = "pkg/#{GEM_NAME}"
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+def execute_commands(commands)
+  commands.each do |command|
+    output = `#{command}`
+    puts "* executed #{command}"
+    puts output unless output.empty?
+  end
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
+task :build do
+  execute_commands ['gem build project.gemspec',
+                    "mv #{GEM_NAME} pkg/"]
 end
 
-task :spec => :check_dependencies
-task :default => :spec
-
-require 'rake/rdoctask'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "configurable #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+task :deploy => [ :build ] do
+  execute_commands ["gem push #{GEM_PATH}"]
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/lib/project/command_set.rb

@@ -0,0 +1,22 @@
+require 'open3'
+module Project
+  class CommandSet
+    attr_accessor :project, :workflow
+    
+    def initialize(project, workflow)
+      self.project, self.workflow = project, workflow
+    end
+    
+    def execute!
+      stdin, stdout, stderr = Open3::popen3 SHELL_BINARY
+      
+      self.workflow.each do |command|
+        command = Template.new(command, self.project).parse!
+        stdin.puts command
+      end
+      
+      stdin.close
+      return stdout.read, stderr.read
+    end
+  end
+end

data/lib/project/core_ext.rb

@@ -1,5 +1,4 @@
 class OpenStruct
-  
   def [](key)
     self.send key
   end

data/lib/project/runner.rb

@@ -18,14 +18,14 @@ module Project
     def run!
       say "* Opening project '#{self.key}' using workflow '#{self.project.workflow}'"
       
-      self.workflow.each_with_index do |command, index|
-        command = Template.new(command, self.project).parse!
-        output  = %x[ #{command} ].chomp
-        
-        unless output.empty?
-          say output
-          seperator unless index == (self.workflow.size - 1)
-        end
+      commands = CommandSet.new(self.project, self.workflow)
+      stdout, stderr = commands.execute!
+      
+      if stderr.empty?
+        puts stdout unless stdout.empty?
+      else
+        say "! An error occurred whilst running the workflow:"
+        say stderr
       end
     end
     
@@ -38,9 +38,5 @@ module Project
       say message
       Kernel.exit(code)
     end
-    
-    def seperator
-      say "", ("*" * 80), ""
-    end
   end
 end

data/lib/project/version.rb

@@ -0,0 +1,6 @@
+module Project
+  module Version
+    MAJOR, MINOR, PATCH = File.open(ROOT + "/VERSION").read.split(".")
+    STRING = [MAJOR, MINOR, PATCH].join(".")
+  end
+end

data/lib/project.rb

@@ -1,18 +1,20 @@
 $:.unshift File.dirname(__FILE__)
-$:.unshift File.join(File.dirname(__FILE__), "project")
 
 module Project
   ROOT = File.expand_path(File.dirname(__FILE__) + "/..")
+  CONFIG = File.join(ENV["HOME"], '.project')
+  SHELL_BINARY = ENV["SHELL"]
 end
 
-require 'core_ext'
-require 'errors'
-require 'template'
-require 'lookup'
-require 'workflow'
-require 'project'
-require 'loader'
-require 'runner'
+require 'project/version'
+require 'project/core_ext'
+require 'project/errors'
+require 'project/command_set'
+require 'project/template'
+require 'project/lookup'
+require 'project/workflow'
+require 'project/project'
+require 'project/loader'
+require 'project/runner'
 
-PROJECT_CONFIG = File.join(ENV["HOME"], '.project')
-Project::Loader.config_path(PROJECT_CONFIG)
+Project::Loader.config_path(Project::CONFIG)

data/project.gemspec

@@ -1,18 +1,14 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in rakefile, and run the gemspec command
-# -*- encoding: utf-8 -*-
+require 'lib/project'
 
 Gem::Specification.new do |s|
   s.name = %q{project}
-  s.version = "1.1.0"
-
+  s.version = Project::Version::STRING
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Nesbitt"]
-  s.date = %q{2010-09-03}
+  s.date = Time.now.strftime("%Y/%m/%d")
   s.description = %q{Project aims to make working with multiple projects as simple as possible. By registering projects with workflows you can quickly create a set of commands that will be run against each project.}
   s.email = %q{josh@josh-nesbitt.net}
-  s.executables = ["project", "project"]
+  s.executables = ["project"]
   s.extra_rdoc_files = [
     "LICENSE"
   ]
@@ -23,8 +19,10 @@ Gem::Specification.new do |s|
      "VERSION",
      "bin/project",
      "lib/project.rb",
+     "lib/project/version.rb",
      "lib/project/core_ext.rb",
      "lib/project/errors.rb",
+     "lib/project/command_set.rb",
      "lib/project/loader.rb",
      "lib/project/lookup.rb",
      "lib/project/project.rb",
@@ -52,27 +50,23 @@ Gem::Specification.new do |s|
   s.summary = %q{A streamlined approach to working with multiple projects and tasks.}
   s.test_files = [
     "spec/lib/core_ext_spec.rb",
-     "spec/lib/errors_spec.rb",
-     "spec/lib/loader_spec.rb",
-     "spec/lib/lookup_spec.rb",
-     "spec/lib/project_spec.rb",
-     "spec/lib/template_spec.rb",
-     "spec/lib/workflow_spec.rb",
-     "spec/spec_helper.rb",
-     "spec/watch.rb"
+    "spec/lib/errors_spec.rb",
+    "spec/lib/loader_spec.rb",
+    "spec/lib/lookup_spec.rb",
+    "spec/lib/project_spec.rb",
+    "spec/lib/template_spec.rb",
+    "spec/lib/workflow_spec.rb",
+    "spec/spec_helper.rb",
+    "spec/watch.rb"
   ]
+  s.post_install_message = <<-MESSAGE
+#{"*"* 80}
+Thanks for installing Project. Please check the README for the changelog:
 
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
+http://github.com/joshnesbitt/project#readme
+#{"*"* 80}
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-    else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    end
-  else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-  end
+  MESSAGE
+  s.platform = Gem::Platform::RUBY
+  s.add_dependency(%q<rspec>, [">= 1.2.9"])
 end
-

data/readme.textile

@@ -3,6 +3,7 @@ h1. Project
 * Overview
 * Installation
 * Usage
+* Changelog
 * Bugs
 * Note on Patches/Pull Requests
 
@@ -51,31 +52,35 @@ h3. Workflows
 A workflow is a set of commands you want run against a particular project. An example workflow might look something like this:
 
 pre. :default:
-  - mate %path
-  - cd %path && gitx
+  - cd %path
+  - mate .
+  - gitx
 
 Which translates to:
 
-* @mate /path/to/project@
-* @cd /path/to/project && gitx@
+* @cd /path/to/project@
+* @mate .@
+* @gitx@
 
 A workflow is just a YAML array of templated commands. Any variable used in a workflow will get looked up on the project that's running it. In the example above the @%path@ variable is replaced by the path specified within the project. Using this method you can quickly build up a set of common workflows to use against many projects.
 
-At the moment each command within a workflow is run inside it's own sub shell. This means that *every command is isolated from other commands within the same workflow*, so instead of doing two commands as @cd /some/path@ and @rake@ you would do @cd /some/path && rake@.
+Each workflow runs within its own subshell. This means that every command executed will run in the environment as it was left by the previous command. Given the above workflow, first a command executes which changes the current directory then commands are executed relative to that directory.
 
 My default workflow looks something like this:
 
 pre. :default:
-  - mate %path
-  - cd %path && gitx
+  - cd %path
+  - mate .
+  - gitx
   - open 'http://%basecamp_url'
   - open 'http://%app'
-  - cd %path && rails server
+  - rails server
 
 Which:
 
-* opens a project in Textmate
-* opens it's Git history
+* changes to the project directory
+* opens the project in Textmate
+* opens it's Git history in GitX
 * opens the Basecamp project for the app
 * starts the Rails server (and opens it up in the default browser)
 
@@ -91,6 +96,18 @@ pre. project name
 
 
 
+h2. Changelog
+
+h3. 1.2.0
+
+* Added the ability for each workflow command to run within the same sub-shell. Commands executed within a sequence now respect the last ran command.
+
+h3. 1.1.0
+
+* Fixed issue in the template regular expression where numerics were being ignored.
+
+
+
 h2. Bugs
 
 If you have any problems with Project, please file an "issue":http://github.com/joshnesbitt/project/issues.

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: project
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 31
   prerelease: false
   segments: 
   - 1
-  - 1
+  - 2
   - 0
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Josh Nesbitt
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-09-03 00:00:00 +01:00
+date: 2010-09-17 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -32,13 +32,12 @@ dependencies:
         - 2
         - 9
         version: 1.2.9
-  type: :development
+  type: :runtime
   version_requirements: *id001
 description: Project aims to make working with multiple projects as simple as possible. By registering projects with workflows you can quickly create a set of commands that will be run against each project.
 email: josh@josh-nesbitt.net
 executables: 
 - project
-- project
 extensions: []
 
 extra_rdoc_files: 
@@ -50,8 +49,10 @@ files:
 - VERSION
 - bin/project
 - lib/project.rb
+- lib/project/version.rb
 - lib/project/core_ext.rb
 - lib/project/errors.rb
+- lib/project/command_set.rb
 - lib/project/loader.rb
 - lib/project/lookup.rb
 - lib/project/project.rb
@@ -75,7 +76,13 @@ has_rdoc: true
 homepage: http://github.com/joshnesbitt/project
 licenses: []
 
-post_install_message: 
+post_install_message: |+
+  ********************************************************************************
+  Thanks for installing Project. Please check the README for the changelog:
+  
+  http://github.com/joshnesbitt/project#readme
+  ********************************************************************************
+  
 rdoc_options: 
 - --charset=UTF-8
 require_paths: