organize 0.1.0 → 1.0.0

data/.gitignore

@@ -1,2 +1,6 @@
 pkg/*
-*.gem
+*.gem
+.bundle
+db/*.sqlite3
+log/*.log
+tmp/**/*

data/Gemfile.lock

@@ -2,7 +2,7 @@ PATH
   remote: .
   specs:
     organize (0.1.0)
-      optitron (~> 0.1)
+      optitron (~> 0.2)
 
 GEM
   remote: http://rubygems.org/
@@ -14,11 +14,11 @@ GEM
     fakefs (0.2.1)
     infinity_test (0.2.0)
       watchr (>= 0.7)
-    optitron (0.1.7)
-      callsite (= 0.0.4)
-      ruby2ruby (= 1.2.4)
-      ruby_parser (>= 2.0)
-      sexp_processor (= 3.0.4)
+    optitron (0.2.0)
+      callsite (~> 0.0.4)
+      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)
@@ -29,12 +29,12 @@ GEM
     rspec-mocks (2.0.0.beta.22)
       rspec-core (= 2.0.0.beta.22)
       rspec-expectations (= 2.0.0.beta.22)
-    ruby2ruby (1.2.4)
+    ruby2ruby (1.2.5)
       ruby_parser (~> 2.0)
       sexp_processor (~> 3.0)
-    ruby_parser (2.0.4)
+    ruby_parser (2.0.5)
       sexp_processor (~> 3.0)
-    sexp_processor (3.0.4)
+    sexp_processor (3.0.5)
     watchr (0.7)
 
 PLATFORMS
@@ -45,7 +45,7 @@ DEPENDENCIES
   derickbailey-notamock (~> 0.0.1)
   fakefs (~> 0.2)
   infinity_test (~> 0.2)
-  optitron (~> 0.1)
+  optitron (~> 0.2)
   organize!
   rspec (= 2.0.0.beta.22)
   watchr (~> 0.6)

data/Rakefile

@@ -2,4 +2,20 @@ require 'bundler'
 Bundler::GemHelper.install_tasks
 
 require 'rspec/core/rake_task'
-RSpec::Core::RakeTask.new :rspec
+RSpec::Core::RakeTask.new :rspec
+
+def gemspec
+  file = 'organize.gemspec'
+  @gemspec ||= eval(File.read(file), binding, file)
+end
+
+desc 'Build the gem'
+task :gem do
+  sh 'gem build organize.gemspec'
+  mv "#{gemspec.full_name}.gem", 'pkg'
+end
+
+desc 'Install organize'
+task :install => :gem do
+  sh "gem install pkg/#{gemspec.full_name}.gem"
+end

data/lib/organize/project.rb

@@ -1,23 +1,16 @@
 module Organize
   class Project
     
-    attr_reader :prefix, :shared_prefix, :name
+    attr_reader :name
+    PREFIX = File.expand_path('~/Projects')
+    SHARED_PREFIX = File.expand_path('~/Dropbox')
     
-    DEFAULTS = {
-      :prefix => '~/Projects',
-      :shared_prefix => '~/Dropbox'
-    }
-    
-    def initialize(name, options = {})
+    def initialize(name)
       @name = name
-      
-      options = DEFAULTS.merge(options)
-      @prefix = options[:prefix]
-      @shared_prefix = options[:shared_prefix]
     end
     
     def path
-      File.join(prefix, name)
+      File.join(PREFIX, name)
     end
     
     def archive_path
@@ -25,7 +18,7 @@ module Organize
     end
     
     def shared_path
-      File.join(shared_prefix, name)
+      File.join(SHARED_PREFIX, name)
     end
     
     def shared_link_path
@@ -33,7 +26,7 @@ module Organize
     end
     
     def project_archive_path
-      File.join(prefix, 'Archive')
+      File.join(PREFIX, 'Archive')
     end
     
     def create
@@ -41,10 +34,7 @@ module Organize
       FileUtils.mkdir_p(shared_path)
       FileUtils.mkdir_p(archive_path)
       FileUtils.mkdir_p(project_archive_path)
-      
-      unless File.exists?(shared_link_path)
-        FileUtils.ln_s(shared_path, shared_link_path)
-      end
+      FileUtils.ln_s(shared_path, shared_link_path) unless File.exists?(shared_link_path)
     end
   end
 end

data/lib/organize/runner.rb

@@ -1,38 +1,42 @@
 require 'optitron'
 require 'yaml'
+require 'fileutils'
 
 module Organize
   class Runner < Optitron::CLI
     desc 'Install organize to your home directory.'
-    def install(prefix = '~/Projects', shared_prefix = '~/Dropbox', inbox = '~/Desktop')
+    def install
+      prefix        = Project::PREFIX
+      shared_prefix = Project::SHARED_PREFIX
+      
+      # Create the prefix and shared prefix.
       FileUtils.mkdir_p(prefix)
       FileUtils.mkdir_p(File.join(prefix, 'Archive'))
       FileUtils.mkdir_p(shared_prefix)
-      FileUtils.mkdir_p(File.join(prefix, 'Other'))
-      FileUtils.ln_s(inbox, File.join(prefix, 'Inbox'))
       
-      ['Documents', 'Movies', 'Music', 'Pictures',  'Public', 'Sites'].each do |directory|
-        FileUtils.ln_s("~/#{directory}", File.join(prefix, 'Other', directory))
-      end
+      # Create Inbox pseudo-project
+      inbox             = File.join(prefix, 'Inbox')
+      inbox_shared      = File.join(shared_prefix, 'Inbox')
+      inbox_shared_link = File.join(inbox, 'Shared')
+      
+      FileUtils.ln_s(File.expand_path('~/Desktop'), inbox) unless File.exists?(inbox)
+      FileUtils.mkdir_p(inbox_shared)
+      FileUtils.ln_s(inbox_shared, inbox_shared_link) unless File.exists?(inbox_shared_link)
       
-      config = {
-        'prefix' => prefix,
-        'shared_prefix' => shared_prefix
-      }
+      # Create the Other project
+      other = Project.new('Other')
+      other.create
       
-      File.open('~/.organize', 'w+') { |f| f.write(YAML::dump(config)) }
+      %w{Documents Movies Music Pictures Public Sites}.each do |directory|
+        old_directory = File.expand_path("~/#{directory}")
+        new_directory = File.join(other.path, directory)
+        FileUtils.ln_s(old_directory, new_directory) unless File.exists?(new_directory)
+      end
     end
     
     desc 'Creates a new project.'
     def create(name)
-      config = YAML::load_file '~/.organize'
-      project = Project.new name, :prefix => config['prefix'], :shared_prefix => config['shared_prefix']
-      project.create
-    end
-    
-    desc 'Gets the prefix.'
-    def prefix
-      print YAML::load_file('~/.organize')['prefix']
+      Project.new(name).create
     end
   end
 end

data/lib/organize/version.rb

@@ -1,3 +1,3 @@
 module Organize
-  VERSION = "0.1.0"
+  VERSION = '1.0.0'
 end

data/organize.gemspec

@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.required_rubygems_version = '~> 1.3.6'
   s.rubyforge_project         = 'organize'
   
-  s.add_dependency 'optitron', '~> 0.1'
+  s.add_dependency 'optitron', '~> 0.2'
   
   s.add_development_dependency 'bundler', '~> 1.0'
   s.add_development_dependency 'rspec', '2.0.0.beta.22'

data/spec/organize/project_spec.rb

@@ -8,42 +8,17 @@ describe Organize::Project do
     subject.name.should == 'Foo'
   end
   
-  context 'when created without a prefix' do
-    its(:prefix) { should == '~/Projects' }
-  end
-  
-  context 'when created without a shared prefix' do
-    its(:shared_prefix) { should == '~/Dropbox' }
-  end
-  
-  context 'when created with a prefix' do
-    subject { Organize::Project.new 'Foo', :prefix => '~/Prefix' }
-    
-    it 'should use that prefix instead of the default one' do
-      subject.prefix.should == '~/Prefix'
-    end
-  end
-  
-  context 'when created with a shared prefix' do
-    subject { Organize::Project.new 'Foo', :shared_prefix => '~/Shared' }
-    
-    it 'should use that prefix instead of the default one' do
-      subject.shared_prefix.should == '~/Shared'
-    end
-  end
-  
   describe '#path' do
     before do
-      project.track_methods :prefix, :name
+      project.track_methods :name
       subject
     end
     
     subject { project.path }
     
     it 'should combine the prefix and name' do
-      project.should have_received(:prefix)
       project.should have_received(:name)
-      should == '~/Projects/Foo'
+      should == File.expand_path('~/Projects/Foo')
     end
   end
   
@@ -57,22 +32,21 @@ describe Organize::Project do
     
     it 'should tack on Archive to the end of the path' do
       project.should have_received(:path)
-      should == '~/Projects/Foo/Archive'
+      should == File.expand_path('~/Projects/Foo/Archive')
     end
   end
   
   describe '#shared_path' do
     before do
-      project.track_methods :shared_prefix, :name
+      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(:shared_prefix)
       project.should have_received(:name)
-      should == '~/Dropbox/Foo'
+      should == File.expand_path('~/Dropbox/Foo')
     end
   end
   
@@ -86,104 +60,38 @@ describe Organize::Project do
     
     it 'should tack on Shared to the end of the path' do
       project.should have_received(:path)
-      should == '~/Projects/Foo/Shared'
+      should == File.expand_path('~/Projects/Foo/Shared')
     end
   end
   
   describe '#project_archive_path' do
-    before do
-      project.track_methods :prefix
-      subject
-    end
-    
     subject { project.project_archive_path }
     
     it 'should tack on Archive to the end of the prefix' do
-      project.should have_received(:prefix)
-      should == '~/Projects/Archive'
+      should == File.expand_path('~/Projects/Archive')
     end
   end
   
   describe '#create' do
     before do
-      FileUtils.rm_rf(project.prefix)
-      FileUtils.rm_rf(project.shared_prefix)
-    end
-    
-    subject { project.create }
-    
-    context 'when the prefix does not exist' do
-      before { subject }
-      
-      it 'should be created' do
-        File.directory?(project.prefix).should be_true
-      end
-      
-      it 'should create the project directory' do
-        File.directory?(project.path).should be_true
-      end
-    end
-    
-    context 'when the prefix does exist' do
-      let(:other_project_path) { File.join(project.prefix, 'Bar') }
-      
-      before do
-        FileUtils.mkdir_p(other_project_path)
-        subject
-      end
-      
-      it 'should not delete the other files/directories in the prefix' do
-        File.directory?(other_project_path).should be_true
-      end
-      
-      it 'should only create the project directory' do
-        File.directory?(project.path).should be_true
-      end
+      FileUtils.rm_rf(File.expand_path('~'))
+      project.create
     end
     
-    context 'when the shared prefix does not exist' do
-      before { subject }
-      
-      it 'should be created' do
-        File.directory?(project.shared_prefix).should be_true
-      end
-      
-      it 'should create the project directory' do
-        File.directory?(project.shared_path).should be_true
-      end
+    it 'should create the project directory' do
+      File.directory?(project.path).should be_true
     end
     
-    context 'when the shared prefix does exist' do
-      let(:other_shared_path) { File.join(project.shared_prefix, 'Bar') }
-      
-      before do
-        FileUtils.mkdir_p(other_shared_path)
-        subject
-      end
-      
-      it 'should not delete the other files/directories in the shared prefix' do
-        File.directory?(other_shared_path).should be_true
-      end
-      
-      it 'should only create the project shared directory' do
-        File.directory?(project.shared_path).should be_true
-      end
+    it 'should create the shared project directory' do
+      File.directory?(project.shared_path).should be_true
     end
     
-    context 'when the archive path does not exist' do
-      before { subject }
-      
-      it 'should be created' do
-        File.directory?(project.archive_path).should be_true
-      end
+    it 'should creat the archive directory' do
+      File.directory?(project.archive_path).should be_true
     end
     
-    context 'when the project archive path does not exist' do
-      before { subject }
-      
-      it 'should be created' do
-        File.directory?(project.project_archive_path).should be_true
-      end
+    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,62 +1,51 @@
 require 'spec_helper'
 
 describe Organize::Runner do
-  let(:runner) { Organize::Runner.new }
+  let(:runner) { Organize::Runner }
   subject { runner }
   
   before do
     FileUtils.rm_rf '~'
     
-    ['~/Desktop', '~/Documents', '~/Movies', '~/Music', '~/Pictures',  '~/Public', '~/Sites'].each do |directory|
-      FileUtils.mkdir_p directory
+    %w{Desktop Documents Movies Music Pictures Public Sites}.each do |directory|
+      directory = File.expand_path("~/#{directory}")
+      FileUtils.mkdir_p(directory)
     end
   end
   
-  # TODO: Make these tests not suck.
   describe '#install' do
-    subject { runner.install }
-    before { subject }
+    before { runner.dispatch(%w{install}) }
     
-    it 'should create the necessary directories' do
-      ['~', '~/Projects', '~/Dropbox', '~/Projects/Archive', '~/Projects/Other'].each do |directory|
+    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 symlink the Other directories' do
-      ['Documents', 'Movies', 'Music', 'Pictures',  'Public', 'Sites'].each do |directory|
-        File.symlink?(File.join('~/Projects/Other', directory)).should be_true
+    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 write to the .organize file correctly' do
-      YAML::load_file('~/.organize').should == {
-        'prefix' => '~/Projects',
-        'shared_prefix' => '~/Dropbox'
-      }
+    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
+      end
     end
   end
   
   describe '#create' do
-    subject { runner.create 'Foo' }
-    
     before do
-      runner.install
-      subject
+      runner.dispatch(%w{install})
+      runner.dispatch(%w{create Foo})
     end
     
     it 'should create the new project' do
       File.directory?('~/Projects/Foo').should be_true
     end
   end
-  
-  describe '#prefix' do
-    subject { runner.prefix }
-    before { runner.install }
-    
-    it 'should return the prefix' do
-      stdout = capture(:stdout) { subject }
-      stdout.should == '~/Projects'
-    end
-  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: organize
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 23
   prerelease: false
   segments: 
-  - 0
   - 1
   - 0
-  version: 0.1.0
+  - 0
+  version: 1.0.0
 platform: ruby
 authors: 
 - Alexander Kern
@@ -26,11 +26,11 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 15
         segments: 
         - 0
-        - 1
-        version: "0.1"
+        - 2
+        version: "0.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -137,7 +137,6 @@ extensions: []
 extra_rdoc_files: []
 
 files: 
-- .bundle/config
 - .gitignore
 - .rspec
 - Gemfile

data/.bundle/config

@@ -1,2 +0,0 @@
---- 
-BUNDLE_DISABLE_SHARED_GEMS: "1"