organize 1.0.1 → 1.1.0

data/Gemfile.lock

@@ -1,51 +1,43 @@
 PATH
   remote: .
   specs:
-    organize (0.1.0)
+    organize (1.0.1)
       optitron (~> 0.2)
 
 GEM
   remote: http://rubygems.org/
   specs:
     callsite (0.0.4)
-    derickbailey-notamock (0.0.1)
-      rspec (>= 1.2.9)
     diff-lcs (1.1.2)
-    fakefs (0.2.1)
-    infinity_test (0.2.0)
-      watchr (>= 0.7)
-    optitron (0.2.0)
-      callsite (~> 0.0.4)
+    fakefs (0.3.1)
+    method-args (0.1.1)
       ruby2ruby (~> 1.2.4)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0.4)
-    rspec (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
-      rspec-mocks (= 2.0.0.beta.22)
-    rspec-core (2.0.0.beta.22)
-    rspec-expectations (2.0.0.beta.22)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.0.beta.22)
-      rspec-core (= 2.0.0.beta.22)
-      rspec-expectations (= 2.0.0.beta.22)
+    optitron (0.3.1)
+      callsite (~> 0.0.4)
+      method-args (~> 0.1.0)
+    rspec (2.4.0)
+      rspec-core (~> 2.4.0)
+      rspec-expectations (~> 2.4.0)
+      rspec-mocks (~> 2.4.0)
+    rspec-core (2.4.0)
+    rspec-expectations (2.4.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.4.0)
     ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
     ruby_parser (2.0.5)
       sexp_processor (~> 3.0)
     sexp_processor (3.0.5)
-    watchr (0.7)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0)
-  derickbailey-notamock (~> 0.0.1)
   fakefs (~> 0.2)
-  infinity_test (~> 0.2)
   optitron (~> 0.2)
   organize!
-  rspec (= 2.0.0.beta.22)
-  watchr (~> 0.6)
+  rspec (~> 2.4)

data/README.md

@@ -32,15 +32,11 @@ projects like Areas of Responsibility. These are *large* goals in your life that
 won't be completed for a couple months or will never be completed. Don't make
 too many of them. I usually have around 13 or so.
 
-Inside of each project folder, there are two folders created for you
+Inside of each project folder, there is a single Shared folder created for you
 automatically. The Shared folder links to a folder in your
 [Dropbox](http://www.dropbox.com/) of the same name as the project. Anything
 that you'd like to share across multiple computers should be placed in here.
 
-The other folder is the Archive folder. Treat this like the Archive folder of
-Gmail. Don't delete things that you may possibly need later. Put them in the
-Archive for storage.
-
 Organize also creates a couple other folders. The Archive folder located in the
 root of the Projects folder are for old projects that you've completed but would
 like to still have the file around, just in case something bad happens. The

data/lib/organize/project.rb

@@ -13,10 +13,6 @@ module Organize
       File.join(PREFIX, name)
     end
     
-    def archive_path
-      File.join(path, 'Archive')
-    end
-    
     def shared_path
       File.join(SHARED_PREFIX, name)
     end
@@ -32,7 +28,6 @@ module Organize
     def create
       FileUtils.mkdir_p(path)
       FileUtils.mkdir_p(shared_path)
-      FileUtils.mkdir_p(archive_path)
       FileUtils.mkdir_p(project_archive_path)
       FileUtils.ln_s(shared_path, shared_link_path) unless File.exists?(shared_link_path)
     end

data/lib/organize/version.rb

@@ -1,3 +1,3 @@
 module Organize
-  VERSION = '1.0.1'
+  VERSION = '1.1.0'
 end

data/organize.gemspec

@@ -18,13 +18,10 @@ Gem::Specification.new do |s|
   s.add_dependency 'optitron', '~> 0.2'
   
   s.add_development_dependency 'bundler', '~> 1.0'
-  s.add_development_dependency 'rspec', '2.0.0.beta.22'
-  s.add_development_dependency 'watchr', '~> 0.6'
-  s.add_development_dependency 'derickbailey-notamock', '~> 0.0.1'
-  s.add_development_dependency 'fakefs', '~> 0.2'
-  s.add_development_dependency 'infinity_test', '~> 0.2'
+  s.add_development_dependency 'rspec',   '~> 2.4'
+  s.add_development_dependency 'fakefs',  '~> 0.2'
   
   s.files        = `git ls-files`.split("\n")
-  s.executables  = `git ls-files`.split("\n").map {|f| f[%r{^bin/(.*)}, 1]}.compact
+  s.executables  = `git ls-files`.split("\n").map { |f| f[%r{^bin/(.*)}, 1] }.compact
   s.require_path = 'lib'
 end

data/spec/organize/project_spec.rb

@@ -1,97 +1,54 @@
 require 'spec_helper'
 
 describe Organize::Project do
-  let(:project) { Organize::Project.new 'Foo' }
-  subject { project }
-  
-  it 'should have a name' do
-    subject.name.should == 'Foo'
+  before do
+    @project = Organize::Project.new 'Foo'
   end
   
-  describe '#path' do
-    before do
-      project.track_methods :name
-      subject
-    end
-    
-    subject { project.path }
-    
-    it 'should combine the prefix and name' do
-      project.should have_received(:name)
-      should == File.expand_path('~/Projects/Foo')
-    end
+  it "should have a #name" do
+    @project.name.should == 'Foo'
   end
   
-  describe '#archive_path' do
-    before do
-      project.track_methods :path
-      subject
-    end
-    
-    subject { project.archive_path }
-    
-    it 'should tack on Archive to the end of the path' do
-      project.should have_received(:path)
-      should == File.expand_path('~/Projects/Foo/Archive')
+  describe "#path" do
+    it "should concatenate the prefix and #name" do
+      @project.path.should == File.expand_path('~/Projects/Foo')
     end
   end
   
-  describe '#shared_path' do
-    before do
-      project.track_methods :name
-      subject
-    end
-    
-    subject { project.shared_path }
-    
-    it 'should tack on the name to the end of the shared path' do
-      project.should have_received(:name)
-      should == File.expand_path('~/Dropbox/Foo')
+  describe "#shared_path" do
+    it "should concatenate the shared prefix #name" do
+      @project.shared_path.should == File.expand_path('~/Dropbox/Foo')
     end
   end
   
-  describe '#shared_link_path' do
-    before do
-      project.track_methods :path
-      subject
-    end
-    
-    subject { project.shared_link_path }
-    
-    it 'should tack on Shared to the end of the path' do
-      project.should have_received(:path)
-      should == File.expand_path('~/Projects/Foo/Shared')
+  describe "#shared_link_path" do
+    it "should concatenate the #path and Shared" do
+      @project.shared_link_path.should == File.expand_path('~/Projects/Foo/Shared')
     end
   end
   
-  describe '#project_archive_path' do
-    subject { project.project_archive_path }
-    
-    it 'should tack on Archive to the end of the prefix' do
-      should == File.expand_path('~/Projects/Archive')
+  describe "#project_archive_path" do
+    it "should tack on Archive to the end of the prefix" do
+      @project.project_archive_path.should == File.expand_path('~/Projects/Archive')
     end
   end
   
-  describe '#create' do
+  describe "#create" do
     before do
-      FileUtils.rm_rf(File.expand_path('~'))
-      project.create
-    end
-    
-    it 'should create the project directory' do
-      File.directory?(project.path).should be_true
+      FileUtils.rm_rf File.expand_path('~')
+      @project.create
     end
     
-    it 'should create the shared project directory' do
-      File.directory?(project.shared_path).should be_true
+    it "should create the project directory" do
+      File.directory?(@project.path).should be_true
     end
     
-    it 'should creat the archive directory' do
-      File.directory?(project.archive_path).should be_true
+    it "should create the shared project directory" do
+      File.directory?(@project.shared_path).should be_true
     end
     
-    it 'should create the project archive directory' do
-      File.directory?(project.project_archive_path).should be_true
+    it "should create the project archive directory" do
+      File.directory?(@project.project_archive_path).should be_true
     end
   end
 end

data/spec/organize/runner_spec.rb

@@ -1,10 +1,8 @@
 require 'spec_helper'
 
 describe Organize::Runner do
-  let(:runner) { Organize::Runner }
-  subject { runner }
-  
   before do
+    @runner = Organize::Runner
     FileUtils.rm_rf '~'
     
     %w{Desktop Documents Movies Music Pictures Public Sites}.each do |directory|
@@ -13,24 +11,26 @@ describe Organize::Runner do
     end
   end
   
-  describe '#install' do
-    before { runner.dispatch(%w{install}) }
+  describe "#install" do
+    before do
+      @runner.dispatch(%w{install})
+    end
     
-    it 'should create the prefixes' do
+    it "should create the prefixes" do
       %w{Projects Dropbox}.each do |directory|
         directory = File.expand_path("~/#{directory}")
         File.directory?(directory).should be_true
       end
     end
     
-    it 'should create the Inbox and Other projects' do
+    it "should create the Inbox and Other projects" do
       %w{Inbox Other}.each do |directory|
         directory = File.expand_path("~/Projects/#{directory}")
         File.directory?(directory).should be_true
       end
     end
     
-    it 'should symlink the Other directories' do
+    it "should symlink the Other directories" do
       %w{Documents Movies Music Pictures Public Sites}.each do |directory|
         directory = File.expand_path("~/Projects/Other/#{directory}")
         File.symlink?(directory).should be_true
@@ -38,13 +38,13 @@ describe Organize::Runner do
     end
   end
   
-  describe '#create' do
+  describe "#create" do
     before do
-      runner.dispatch(%w{install})
-      runner.dispatch(%w{create Foo})
+      @runner.dispatch(%w{install})
+      @runner.dispatch(%w{create Foo})
     end
     
-    it 'should create the new project' do
+    it "should create the new project" do
       File.directory?('~/Projects/Foo').should be_true
     end
   end

data/spec/spec_helper.rb

@@ -1,13 +1,12 @@
 require 'bundler/setup'
 
 require 'rspec'
-require 'not_a_mock'
 require 'fakefs/spec_helpers'
 
 require 'organize'
 Dir[File.dirname(__FILE__) + '/support/**/*.rb'].each { |f| require f }
 
 RSpec.configure do |config|
-  config.mock_with NotAMock::RspecMockFrameworkAdapter
+  config.mock_with :rspec
   config.include FakeFS::SpecHelpers
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: organize
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 1
-  - 0
   - 1
-  version: 1.0.1
+  - 0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Alexander Kern
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-05 00:00:00 -07:00
+date: 2011-01-11 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -54,68 +54,19 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - "="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 62196431
+        hash: 11
         segments: 
         - 2
-        - 0
-        - 0
-        - beta
-        - 22
-        version: 2.0.0.beta.22
+        - 4
+        version: "2.4"
   type: :development
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: watchr
-  prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 0
-        - 6
-        version: "0.6"
-  type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: derickbailey-notamock
-  prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 29
-        segments: 
-        - 0
-        - 0
-        - 1
-        version: 0.0.1
-  type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: fakefs
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 0
-        - 2
-        version: "0.2"
-  type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: infinity_test
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -126,7 +77,7 @@ dependencies:
         - 2
         version: "0.2"
   type: :development
-  version_requirements: *id007
+  version_requirements: *id004
 description: Creates directories and links to manage your Mac consistently.
 email: 
 - alex@kernul.com
@@ -153,8 +104,7 @@ files:
 - spec/organize/project_spec.rb
 - spec/organize/runner_spec.rb
 - spec/spec_helper.rb
-- spec/support/helpers/capture.rb
-- spec/support/matchers/matchers.rb
+- spec/support/helpers.rb
 has_rdoc: true
 homepage: http://github.com/CapnKernul/organize
 licenses: []
@@ -187,7 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: organize
-rubygems_version: 1.3.7
+rubygems_version: 1.4.1
 signing_key: 
 specification_version: 3
 summary: Organize your Mac filesystem.

data/spec/support/helpers/capture.rb

@@ -1,15 +0,0 @@
-require 'stringio'
-
-def capture(*streams)
-  streams.map! { |stream| stream.to_s }
-  
-  begin
-    result = StringIO.new
-    streams.each { |stream| eval "$#{stream} = result" }
-    yield
-  ensure
-    streams.each { |stream| eval("$#{stream} = #{stream.upcase}") }
-  end
-  
-  result.string
-end