enzyme 0.1.4 → 1.0.0.beta01

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2011 Haydn Ewers
+Copyright (c) 2012 Katalyst Interactive
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -0,0 +1,27 @@
+Enzyme
+======
+
+Katayst Interactive's project collaboration tool.
+
+Getting Started
+---------------
+
+### Installing
+
+    gem install enzyme
+
+
+Contributing
+------------
+
+1.  Check out the develop branch to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
+2.  Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
+3.  Fork the project.
+4.  Start a feature/<name> branch.
+5.  Commit and push until you are happy with your contribution.
+6.  Please try not to mess with the Rakefile or version.
+
+Copyright
+---------
+
+Copyright (c) 2012 Katalyst Interactive. See LICENSE.txt for further details.

data/VERSION

@@ -1 +1 @@
-0.1.4
+1.0.0.beta01

data/bin/enzyme

@@ -3,10 +3,9 @@
 lib_dir = File.join(File.dirname(__FILE__), '..', 'lib')
 $LOAD_PATH.unshift lib_dir if File.directory?(lib_dir)
 
-require 'setup'
 require 'enzyme'
 
 # Require all commands in the commands directory.
 Dir["#{lib_dir}/commands/*.rb"].each {|file| require "commands/"+File.basename(file, ".rb") }
 
-Enzyme.run()
+Enzyme.run()

data/lib/commands/config.rb

@@ -1,75 +1,103 @@
-require 'yaml'
-require 'hash'
 require 'enzyme'
 
 module Config extend self
 
-  GLOBAL_FILENAME = "#{ENV['HOME']}/.enzyme.yml"
-  PROJECT_FILENAME = "./.enzyme.yml"
-
   def run()
-    global = ARGV.delete('--global')
-    ARGV.reject { |x| x.start_with?("-") }
+    file = ['--global', '--organisation', '--project'].keep_if { |x| ARGV.delete(x) }.last.to_s[/[a-z]+$/] || nil
+    ARGV.each { |x| raise UnknownOption.new(x) if x.start_with?("-") }
     key = ARGV.shift
     value = ARGV.shift
+    ARGV.each { |x| raise UnknownArgument.new(x) }
 
     unless value === nil
-      set(key, value, global)
+      set(key, value, file)
+      puts "Set '#{key}' to '#{value}' in '#{$system_settings.config[file].path}'."
     else
-      val = get(key)
-      if val.is_a?(Array) || val.is_a?(Hash) || val.is_a?(Settings)
+      val = get(key, file)
+      if val.is_a?(Array) || val.is_a?(Hash)
         puts val.to_hash.to_yaml
       else
         puts val.to_s
       end
     end
+    puts
+  end
+
+  # Checks if the given setting has a value.
+  # - key: The setting to check.
+  def is_set?(key)
+    (get(key).nil? || get(key).empty?) ? false : true
   end
 
-  def get(key)
-    s = $settings
-    key.split('.').each { |o| s = s[o] } if key
+  # Gets the value of a given setting.
+  # - key: The setting to get.
+  # - file: If set, specifies which config file to get the setting from.
+  def get(key, file=nil)
+    s = file ? (YAML.load_file($system_settings.config[file.to_s].path) || {}) : $settings
+    key.to_s.split('.').each do |o|
+      return nil if s[o].nil?
+      s = s[o]
+    end
     s
   end
 
-  def set(key, value, global=false)
-    filename = global ? GLOBAL_FILENAME : PROJECT_FILENAME
-    settings = YAML.load_file(filename) || {}
+  # Sets the value of the given setting.
+  # - key: The setting to set.
+  # - value: The value to set the setting to.
+  # - file: Which config file to set the setting in.
+  def set(key, value, file=nil)
+    if file.nil?
+      file = $system_settings.config.project.exists ? "project" : "global"
+    else
+      file = file.nil? ? 'global' : file.to_s
+    end
+
+    # Bail if the config file doesn't exist.
+    raise ConfigFileNotFound.new($system_settings.config[file].path) unless $system_settings.config[file].exists
 
     # FIXME: This could be simplified... heaps.
-    newSettings = {}
-    n = newSettings
+    new_settings = { 'enzyme_version' => $system_settings.version }
+    current_hash = new_settings
     keys = key.to_s.split(".")
-    keys.each do |k|
-      k = k.to_i if k == k.to_i.to_s
-      n[k] = (k == keys.last) ? value : {}
-      n = n[k]
+    keys.each do |key|
+      key = key.to_i if key.is_i?
+      current_hash[key] = (key == keys.last) ? value : {}
+      current_hash = current_hash[key]
     end
 
-    settings = settings.deep_merge(newSettings)
+    $settings = $settings.deep_merge(new_settings)
+
+    # Reload the settings to avoid including temporary settings.
+    settings = YAML.load_file($system_settings.config[file].path) || {}
+    # Merge in the new settings.
+    settings = settings.deep_merge(new_settings)
+
+    # Save the settings to the config file.
+    write($system_settings.config[file].path, settings)
+  end
 
-    File.open(filename, "w") { |f| f.write(settings.to_yaml) }
+  def write(path, settings)
+    File.open(path, "w") do |f|
+      f.write("\# Generated by Enzyme.\n")
+      f.write(settings.to_yaml)
+    end
   end
 
 end
 
-Enzyme.register(Config) do
-  puts 'CONFIG COMMAND'
-  puts '--------------'
-  puts ''
-  puts '### SYNOPSIS'
-  puts ''
-  puts '    enzyme config [<key> [<value> [--global]]]'
-  puts ''
-  puts '### EXAMPLES'
-  puts ''
-  puts '    enzyme config user dave --global'
-  puts ''
-  puts '    enzyme config user'
-  puts '    > dave'
-  puts ''
-  puts '    enzyme config project_name my_project'
-  puts ''
-  puts '    enzyme config project_name'
-  puts '    > my_project'
-  puts ''
-end
+Enzyme.register('config', Config) do
+  puts "#{$format.bold}SYNOPSIS#{$format.normal}"
+  puts '     enzyme config [<key> [<value> [--global]]]'
+  puts
+  puts "#{$format.bold}EXAMPLES#{$format.normal}"
+  puts '     enzyme config user dave --global'
+  puts
+  puts '     enzyme config user'
+  puts '     > dave'
+  puts
+  puts '     enzyme config project_name my_project'
+  puts
+  puts '     enzyme config project_name'
+  puts '     > my_project'
+  puts
+end

data/lib/commands/create.rb

@@ -1,136 +1,100 @@
 require 'enzyme'
 require 'commands/config'
+require 'commands/join'
 
 module Create extend self
 
   def run()
-    ARGV.reject { |x| x.start_with?("-") }
-    @@project_name = ARGV.shift
-    @@project_type = ARGV.shift
-
-    if @@project_name
-      if @@project_type
-        case @@project_type.to_sym
-        when :pms
-          pms
-        when :koi
-          koi
-        else
-          raise "Unknown project type `#{project_type}`."
-        end
-      else
-        base
-      end
-      puts
-      puts "Complete."
-      puts
-    else
-      raise "A project name must be given. For example: `enzyme create project_name`"
-    end
-  end
-
-  def base
-    raise "The `projects_directory` setting is not set. Set it using `enzyme config projects_directory \"/Users/me/Projects\" --global`." unless $settings.projects_directory
-    raise "The `sync.shared_directory` setting is not set. Set it using `enzyme config sync.shared_directory \"shared\" --global`." unless $settings.sync.shared_directory
-    raise "The `user` setting is not set. Set it using `enzyme config user \"me\" --global`." unless $settings.user
-
-    @@project_name = @@project_name+'_'+Time.now.strftime('%y%m') unless @@project_name =~ /^.+_\d{4}$/
-
-    puts
-    puts "Creating the '#{@@project_name}' project at '#{$settings.projects_directory}/#{@@project_name}'..."
-    puts
+    skip_join = !!ARGV.delete("--skip-join")
+    ARGV.each { |x| raise UnknownOption.new(x) if x.start_with?("-") }
+    project_name = ARGV.shift
+    ARGV.each { |x| raise UnknownArgument.new(x) }
 
-    system "mkdir #{$settings.projects_directory}/#{@@project_name}"
-    # TODO: Move the resources directory and it's content to the sync command. Create shouldn't be responsible for it.
-    system "mkdir #{$settings.projects_directory}/#{@@project_name}/resources"
-    system "mkdir #{$settings.projects_directory}/#{@@project_name}/resources/#{$settings.sync.shared_directory}"
-    system "mkdir #{$settings.projects_directory}/#{@@project_name}/resources/#{$settings.user}"
-    system "touch #{$settings.projects_directory}/#{@@project_name}/.enzyme.yml"
+    raise ArgumentMissing.new("project_name") unless project_name
 
-    Dir.chdir("#{$settings.projects_directory}/#{@@project_name}")
+    create(project_name)
 
-    Config.set('project_name', @@project_name)
-    Config.set('project_type', nil)
+    Join.join(project_name) unless skip_join
   end
 
-  def koi
-    raise "The `projects_directory` setting is not set. Set it using `enzyme config projects_directory \"/Users/me/Projects\" --global`." unless $settings.projects_directory
-    raise "The `github.user` setting is not set. Set it using `enzyme config github.user \"me\" --global`." unless $settings.github.user
-    raise "The `github.token` setting is not set. Set it using `enzyme config github.token \"0123456789abcdef0123456789abcdef\" --global`." unless $settings.github.token
+  def create(project_name)
+    raise SyncServerRequired.new unless $system_settings.sync_server.exists
+    raise SettingMissing.new("sync.projects_directory", "path/to/directory", "organisation") unless $settings.sync.projects_directory
 
-    base
+    directory = "#{$system_settings.sync_server.path}/#{$settings.sync.projects_directory}/#{project_name}"
 
-    Config.set('project_type', 'koi')
+    # If the project already exists, raise an error.
+    raise ProjectAlreadyExists.new(directory) if File.directory?(directory)
 
-    puts
-    puts "Downloading the latest version of Koi from 'https://github.com/katalyst/koi_cms/zipball/master'..."
-    puts
-
-    system "curl -o '/tmp/#{@@project_name}.zip' -F 'login=#{$settings.github.user}' -F 'token=#{$settings.github.token}' -L 'https://github.com/katalyst/koi_cms/zipball/master'"
-
-    puts
-    puts 'Extracting...'
-    puts
+    create_repo directory, [ "*", "!.enzyme.yml", "!.gitignore" ]
+    Config.write("#{directory}/.enzyme.yml", { "project_name" => project_name })
+    commit_repo directory
+    detach_repo directory
 
-    system "unzip '/tmp/#{@@project_name}.zip' -d '/tmp/#{@@project_name}.temp'"
-    system "rm '/tmp/#{@@project_name}.zip'"
+    create_repo "#{directory}/shared"
+    commit_repo "#{directory}/shared"
+    detach_repo "#{directory}/shared"
 
-    extracted_dir = Dir.entries("/tmp/#{@@project_name}.temp")[2]
+    create_repo "#{directory}/working"
+    commit_repo "#{directory}/working"
+    detach_repo "#{directory}/working"
 
+    puts "Created remote project at:"
     puts
-    puts "Copying to '#{$settings.projects_directory}/#{@@project_name}/'..."
+    puts "    #{directory}"
     puts
-
-    system "mv /tmp/#{@@project_name}.temp/#{extracted_dir}/* #{$settings.projects_directory}/#{@@project_name}"
-    system "rm -r '/tmp/#{@@project_name}.temp'"
   end
 
-  def pms
-    raise "The `projects_directory` setting is not set. Set it using `enzyme config projects_directory \"/Users/me/Projects\" --global`." unless $settings.projects_directory
-    raise "The `github.user` setting is not set. Set it using `enzyme config github.user \"me\" --global`." unless $settings.github.user
-    raise "The `github.token` setting is not set. Set it using `enzyme config github.token \"0123456789abcdef0123456789abcdef\" --global`." unless $settings.github.token
+  def create_repo(path, gitignore=[])
+    # Create the project's directory.
+    system "mkdir -p #{path} > /dev/null"
 
-    base
+    # Change into the directory.
+    system "cd #{path} > /dev/null"
+    Dir.chdir(path)
 
-    Config.set('project_type', 'pms')
+    # Gitify.
+    system "git init > /dev/null"
+    system "echo '#{gitignore.join("\n")}' > .gitignore"
+  end
 
-    puts
-    puts "Downloading v0.4.2alpha03 of the PMS from 'https://github.com/katalyst/pms/zipball/v0.4.2alpha03'..."
-    puts
+  def commit_repo(path)
+    # Create the project's directory.
+    system "mkdir -p #{path} > /dev/null"
 
-    system "curl -o '/tmp/#{@@project_name}.zip' -F 'login=#{$settings.github.user}' -F 'token=#{$settings.github.token}' -L 'https://github.com/katalyst/pms/zipball/v0.4.2alpha03'"
+    # Change into the directory.
+    system "cd #{path} > /dev/null"
+    Dir.chdir(path)
 
-    puts
-    puts 'Extracting...'
-    puts
+    # Gitify.
+    system "git add . > /dev/null"
+    system "git commit -m 'Initial commit.' > /dev/null"
+  end
 
-    system "unzip '/tmp/#{@@project_name}.zip' -d '/tmp/#{@@project_name}.temp'"
-    system "rm '/tmp/#{@@project_name}.zip'"
+  def detach_repo(path)
+    # Create the project's directory.
+    system "mkdir -p #{path} > /dev/null"
 
-    extracted_dir = Dir.entries("/tmp/#{@@project_name}.temp")[2]
+    # Change into the directory.
+    system "cd #{path} > /dev/null"
+    Dir.chdir(path)
 
-    puts
-    puts "Copying to '#{$settings.projects_directory}/#{@@project_name}/'..."
-    puts
-
-    system "mv /tmp/#{@@project_name}.temp/#{extracted_dir}/* #{$settings.projects_directory}/#{@@project_name}"
-    system "rm -r '/tmp/#{@@project_name}.temp'"
+    # Gitify.
+    system "git checkout -q --detach > /dev/null"
   end
 
 end
 
-Enzyme.register(Create) do
-  puts 'CREATE COMMAND'
-  puts '--------------'
-  puts ''
-  puts '### SYNOPSIS'
-  puts ''
-  puts '    enzyme create <project_name> [pms | koi]'
-  puts ''
-  puts '### EXAMPLES'
-  puts ''
-  puts '    enzyme create my_project pms'
-  puts ''
-  puts '    enzyme create another_project koi'
-  puts ''
-end
+Enzyme.register('create', Create) do
+  puts "#{$format.bold}SYNOPSIS#{$format.normal}"
+  puts '     enzyme create <project_name>'
+  puts
+  puts "#{$format.bold}EXAMPLES#{$format.normal}"
+  puts '     > enzyme create example-project'
+  puts '     '
+  puts '     Created local project at:'
+  puts '     '
+  puts '       `/Users/jane/Projects/example-project`'
+  puts '     '
+  puts
+end

data/lib/commands/join.rb

@@ -0,0 +1,59 @@
+require 'enzyme'
+require 'commands/config'
+
+module Join extend self
+
+  def run()
+    # --skip-shared
+    # --skip-working
+    ARGV.each { |x| raise UnknownOption.new(x) if x.start_with?("-") }
+    project_name = ARGV.shift
+    ARGV.each { |x| raise UnknownArgument.new(x) }
+
+    raise ArgumentMissing.new("project_name") unless project_name
+
+    join(project_name)
+  end
+
+  def join(project_name)
+    raise SyncServerRequired.new unless $system_settings.sync_server.exists
+    raise SettingMissing.new("projects_directory") unless $settings.projects_directory
+    raise SettingMissing.new("sync.projects_directory") unless $settings.sync.projects_directory
+    raise SettingMissing.new("short_name") unless $settings.short_name
+
+    local_directory = "#{$settings.projects_directory}/#{project_name}"
+    remote_directory = "#{$system_settings.sync_server.path}/#{$settings.sync.projects_directory}/#{project_name}"
+
+    # If the local project directory already exists, raise an error.
+    raise ProjectAlreadyExists.new(local_directory) if File.directory?(local_directory)
+
+    # If the remote project directory doesn't exists, raise an error.
+    raise CannotFindProject.new(remote_directory) unless File.directory?(remote_directory)
+
+    # Clone the shared and working directories.
+    system "git clone -q #{remote_directory} #{local_directory}"
+    system "cd #{local_directory}; git checkout -q master;"
+    system "git clone -q #{remote_directory}/shared #{local_directory}/shared"
+    system "cd #{local_directory}/shared; git checkout -q master;"
+    system "git clone -q #{remote_directory}/working #{local_directory}/working"
+    system "cd #{local_directory}/working; git checkout -q master;"
+
+    # Create the user's working directory unless it's already there.
+    system "mkdir #{local_directory}/working/#{$settings.short_name}" unless File.directory?("#{local_directory}/working/#{$settings.short_name}")
+
+    puts "Joined the '#{project_name}' project at:"
+    puts
+    puts "    #{local_directory}"
+    puts
+  end
+
+end
+
+Enzyme.register('join', Join) do
+  puts "#{$format.bold}SYNOPSIS#{$format.normal}"
+  puts '     enzyme join <project_name>'
+  puts
+  puts "#{$format.bold}EXAMPLES#{$format.normal}"
+  puts '     enzyme join abc'
+  puts
+end

data/lib/commands/sync.rb

@@ -2,48 +2,76 @@ require 'enzyme'
 
 module Sync extend self
 
-  def run()
-    ARGV.reject { |x| x.start_with?("-") }
+  def run
+    skip_shared = !!ARGV.delete("--skip-shared")
+    skip_working = !!ARGV.delete("--skip-working")
+    ARGV.each { |x| raise UnknownOption.new(x) if x.start_with?("-") }
     project_name = ARGV.shift || $settings.project_name
+    ARGV.each { |x| raise UnknownArgument.new(x) }
 
-    raise "No project name specified. Ensure you're in the project's directory or set it specifically. Run `enzyme help sync` for help." unless project_name
-    raise "The #{project_name} project could not be found." unless File.exist?("#{$settings.projects_directory}/#{project_name}")
-    raise "The `sync.share_name` setting is not set. Set it using `enzyme config sync.share_name \"Share Name\" --global`." unless $settings.sync.share_name
-    raise "The `sync.host` setting is not set. Set it using `enzyme config sync.host \"Host._afpovertcp._tcp.local\" --global`." unless $settings.sync.host
-    raise "The `sync.projects_directory` setting is not set. Set it using `enzyme config sync.projects_directory \"My Projects Directory\" --global`." unless $settings.sync.projects_directory
-    raise "The `user` setting is not set. Set it using `enzyme config user \"my_directory\" --global`." unless $settings.user
-    raise "The `sync.shared_directory` setting is not set. Set it using `enzyme config sync.shared_directory \"our_shared_directory\" --global`." unless $settings.sync.shared_directory
-
-    # Mount the network volume. Only works on OS X.
-    system "mkdir \"/Volumes/#{$settings.sync.share_name}\""
-    system "mount -t afp \"afp://#{$settings.sync.host}/#{$settings.sync.share_name}\" \"/Volumes/#{$settings.sync.share_name}\""
-    system "mkdir \"/Volumes/#{$settings.sync.share_name}/#{$settings.sync.projects_directory}/#{project_name}\""
-    # Pull.
-    system "rsync -aH --stats -v -u --progress --exclude '#{$settings.user}/**' \"/Volumes/#{$settings.sync.share_name}/#{$settings.sync.projects_directory}/#{project_name}/\" '#{$settings.projects_directory}/#{project_name}/resources/'"
-    # Push.
-    system "rsync -aH --stats -v -u --progress --include '*/' --include '#{$settings.sync.shared_directory}/**' --include '#{$settings.user}/**' --exclude '*' '#{$settings.projects_directory}/#{project_name}/resources/' \"/Volumes/#{$settings.sync.share_name}/#{$settings.sync.projects_directory}/#{project_name}/\""
+    raise ArgumentOrSettingMissing.new("project_name", "project_name") unless project_name
+    raise SettingMissing.new("projects_directory") unless $settings.projects_directory
+
+    directory = "#{$settings.projects_directory}/#{project_name}"
+
+    raise CannotFindProject.new(directory) unless File.directory?(directory)
+
+    # BASE
+
+    system "cd #{directory}"
+    Dir.chdir("#{directory}")
+
+    system "git add .enzyme.yml > /dev/null"
+    system "git commit -m 'Enzyme sync.'"
+    system "git pull > /dev/null"
+    system "git push > /dev/null"
+
+    # SHARED
+
+    unless skip_shared
+      system "cd #{directory}/shared"
+      Dir.chdir("#{directory}/shared")
+
+      system "git checkout -q . > /dev/null"
+      system "git add . > /dev/null"
+      system "git commit -m 'Enzyme sync.'"
+      system "git pull > /dev/null"
+      system "git push > /dev/null"
+    end
+
+    # WORKING
+
+    system "cd #{directory}/working"
+    Dir.chdir("#{directory}/working")
+
+    system "git add #{$settings.short_name} > /dev/null"
+    system "git add -u > /dev/null"
+    system "git commit -a -m 'Enzyme sync.'"
+    system "git clean -fd > /dev/null"
+    system "git pull > /dev/null"
+    system "git push > /dev/null"
   end
 
 end
 
-Enzyme.register(Sync) do
-  puts 'SYNC COMMAND'
-  puts '------------'
-  puts ''
-  puts '### SYNOPSIS'
-  puts ''
-  puts '    enzyme sync [<project_name>]'
-  puts ''
-  puts '### OPTIONS'
-  puts ''
-  puts '<project_name>'
-  puts ':   The name of the project to sync. If the working directory is the root of a project this option does not need to be passed.'
-  puts ''
-  puts '### EXAMPLES'
-  puts ''
-  puts '    cd ~/Projects/my_project'
-  puts '    enzyme sync'
-  puts ''
-  puts '    enzyme sync another_project'
-  puts ''
-end
+Enzyme.register('sync', Sync) do
+  puts "#{$format.bold}SYNOPSIS#{$format.normal}"
+  puts '     enzyme sync [<project_name>] [--discard-changes] [--init]'
+  puts
+  puts "#{$format.bold}DESCRIPTION#{$format.normal}"
+  puts '     Options:'
+  puts
+  puts "     #{$format.bold}<project_name>#{$format.normal}"
+  puts '             The name of the project to sync. If the working directory is the root of a project this option does not need to be passed.'
+  puts
+  puts "#{$format.bold}EXAMPLES#{$format.normal}"
+  puts '     You can run sync like this:'
+  puts
+  puts '     enzyme sync another_project'
+  puts '             If you specify a project you can run sync from anywhere.'
+  puts
+  puts '     cd ~/Projects/my_project'
+  puts '     enzyme sync'
+  puts '             When the working directory is the root of a project you can run sync without any arguments.'
+  puts
+end

data/lib/enzyme.rb

@@ -1,21 +1,29 @@
+require 'setup'
+
 module Enzyme extend self
 
   @@commands = {}
 
   def run
     # Only shift the first argument off the ARGV if help flags haven't been passed.
-    command = (ARGV.delete("-h") || ARGV.delete("--help")) ? 'help' : (ARGV.shift || 'help')
+    command = (ARGV.delete("-h") || ARGV.delete("--help")) ? 'help' : ARGV.shift
+
+    puts
 
     # Show info, help or run the requested command if it has been registered.
     begin
-      if command.eql?('help')
+      if command.nil?
+        info
+        help
+      elsif command.eql?('info')
+        info
+      elsif command.eql?('help')
         help
       else
-        if @@commands.include?(command.to_s.downcase)
-          @@commands[command.to_s.downcase][:class].run()
+        if @@commands.include?(command)
+          @@commands[command][:class].run
         else
-          error("Unable to find command `#{command}`.")
-          help
+          raise UnknownCommand.new(command)
         end
       end
     rescue StandardError => e
@@ -24,65 +32,66 @@ module Enzyme extend self
   end
 
   def info
-    puts 'ENZYME'
-    puts '======'
-    puts ''
-    puts 'Katalyst\'s project collaboration tool.'
-    puts ''
-    puts 'Version: '+$version
-    puts ''
+    puts '+-------------------------------------------------+'
+    puts '| #####  ##  ##  ######  ##   ##  ##    ##  ##### |'
+    puts '| ##     ### ##     ##    ## ##   ###  ###  ##    |'
+    puts '| #####  ######    ##      ###    ########  ##### |'
+    puts '| ##     ## ###   ##       ##     ## ## ##  ##    |'
+    puts '| #####  ##  ##  ######   ##      ##    ##  ##### |'
+    puts '+-------------------------------------------------+'
+    puts
+    puts "#{$format.bold}DESCRIPTION#{$format.normal}"
+    puts '     Katalyst\'s project collaboration tool.'
+    puts
+    puts "#{$format.bold}VERSION#{$format.normal}"
+    puts "     #{$system_settings.version}"
+    puts
   end
 
   def help
     ARGV.reject { |x| x.start_with?("-") }
     command = ARGV.shift
 
-    info
-
     if command
       if @@commands.include?(command.to_s.downcase)
         @@commands[command.to_s.downcase][:help].call
       else
-        error("No help available for `#{name}`.")
+        error("No help available for `#{command}`.")
       end
     else
-      puts 'USAGE'
-      puts '-----'
-      puts ''
-      puts '### Commands'
-      puts ''
-      puts '    enzyme config [<key> [<value> [--global]]]'
-      puts '    enzyme create <project_name> [pms | koi]'
-      # puts '    enzyme join <project_name>'
-      puts '    enzyme sync [<project_name>]'
-      puts ''
-      puts '### Help'
-      puts ''
-      puts '    enzyme help [<command>]'
-      puts '    enzyme [<command>] --help'
-      puts '    enzyme [<command>] -h'
-      puts ''
-      puts '### Debugging'
-      puts ''
-      puts 'Use `--trace` at anytime to get full stacktraces.'
-      puts ''
+      puts "#{$format.bold}SYNOPSIS#{$format.normal}"
+      puts '     enzyme <command> [<options>]'
+      puts
+      puts "#{$format.bold}HELP#{$format.normal}"
+      puts '     enzyme help [<command>]'
+      puts '     enzyme [<command>] --help'
+      puts '     enzyme [<command>] -h'
+      puts
+      puts "#{$format.bold}COMMANDS#{$format.normal}"
+
+      ([ "info" ]+@@commands.keys).sort.each { |command| puts "     #{command}" }
+
+      puts
+      puts "#{$format.bold}DEBUGGING#{$format.normal}"
+      puts '     Use `--trace` at anytime to get full stacktraces.'
+      puts '     Use `--skip-sync-server` to prevent the sync server from mounting automatically.'
+      puts
     end
   end
 
   def error(error)
-    if $trace_errors && error.is_a?(StandardError)
+    if $system_settings.trace_errors
       raise error
     else
-      puts 'ERROR'
-      puts '-----'
-      puts ''
-      puts '> '+error
-      puts ''
+      puts "#{$format.bold}ERROR: #{error}#{$format.normal}"
+      puts
+      puts '  Run `enzyme help` for help or use the `--trace` option to get a full stacktrace.'
+      puts
     end
   end
 
-  def register(command_class, &block)
-    @@commands[command_class.to_s.downcase] = { :class => command_class, :help => block }
+  def register(command, command_class, &block)
+    @@commands[command] = { :class => command_class, :help => block }
   end
 
-end
+end

data/lib/errors.rb

@@ -0,0 +1,79 @@
+class UnknownOption < StandardError
+
+  def initialize(name)
+    super("Unknown option '#{name}'.")
+  end
+
+end
+
+class UnknownArgument < StandardError
+
+  def initialize(name)
+    super("Unknown argument '#{name}'.")
+  end
+
+end
+
+class ArgumentMissing < StandardError
+
+  def initialize(name)
+    super("The '#{name}' argument is required.")
+  end
+
+end
+
+class SettingMissing < StandardError
+
+  def initialize(name, suggested_value="value", config_file="global")
+    super("The `#{name}` setting is not set. Set it using `enzyme config #{name} '#{suggested_value}' --#{config_file}`.")
+  end
+
+end
+
+class ConfigFileNotFound < StandardError
+
+  def initialize(path)
+    super("Config file could not be found at '#{path}'.")
+  end
+
+end
+
+class SyncServerRequired < StandardError
+
+  def initialize
+    super("Sync server could not be found. Make sure the `sync.share_name` & `sync.host_name` settings are correct and you are connected to the right network.")
+  end
+
+end
+
+class ProjectAlreadyExists < StandardError
+
+  def initialize(path)
+    super("A project already exists at '#{path}'.")
+  end
+
+end
+
+class CannotFindProject < StandardError
+
+  def initialize(path)
+    super("Cannot find a project at '#{path}'.")
+  end
+
+end
+
+class ArgumentOrSettingMissing < StandardError
+
+  def initialize(argument_name, setting_name)
+    super("The '#{argument_name}' argument was not provided and the '#{setting_name}' setting is not set.")
+  end
+
+end
+
+class UnknownCommand < StandardError
+
+  def initialize(command)
+    super("Unable to find command `#{command}`.")
+  end
+
+end

data/lib/hash.rb

@@ -1,8 +1,19 @@
-# From: http://www.ruby-forum.com/topic/142809
-# Author: Stefan Rusterholz
 class Hash
+
+  # From: http://www.ruby-forum.com/topic/142809
+  # Author: Stefan Rusterholz
   def deep_merge(second)
      merger = proc { |key,v1,v2| Hash === v1 && Hash === v2 ? v1.merge(v2, &merger) : v2 }
      self.merge(second, &merger)
   end
-end
+
+  # Make hashes act like ECMAScript objects.
+  def method_missing(sym, *args)
+    if sym.to_s =~ /(.+)=$/
+      self[$1] = args.first
+    else
+      self[sym] || self[sym.to_s]
+    end
+  end
+
+end

data/lib/setup.rb

@@ -1,27 +1,91 @@
 require 'yaml'
 require 'hash'
-require 'settings'
-
-# Make sure there's a global settings file.
-system "touch \"#{ENV['HOME']}/.enzyme.yml\"" unless File.exist?("#{ENV['HOME']}/.enzyme.yml")
-
-# Default settings.
-config = {
-  :github => {
-    :user => `git config --global github.user`.rstrip,
-    :token => `git config --global github.token`.rstrip
-  }
-}
+require 'string'
+require 'errors'
+
+# Global formatting helpers.
+$format = {}
+$format.bold = `tput bold`
+$format.normal = `tput sgr0`
+
+# System settings.
+$system_settings                            = {}
+$system_settings.config                     = {}
+$system_settings.config.global              = {}
+$system_settings.config.global.exists       = false
+$system_settings.config.global.path         = "#{ENV['HOME']}/.enzyme.yml"
+$system_settings.config.organisation        = {}
+$system_settings.config.organisation.exists = false
+$system_settings.config.organisation.path   = nil
+$system_settings.config.project             = {}
+$system_settings.config.project.exists      = false
+$system_settings.config.project.path        = "./.enzyme.yml"
+$system_settings.sync_server                = {}
+$system_settings.sync_server.exists         = false
+$system_settings.sync_server.path           = nil
+$system_settings.sync_server.skip           = !!ARGV.delete('--skip-sync-server')
+$system_settings.trace_errors               = !!ARGV.delete('--trace')
+$system_settings.version                    = File.read(File.join(File.dirname(__FILE__), '..', 'VERSION'))
+
+# User configurable settings.
+$settings                         = {}
+$settings.enzyme_version          = nil
+$settings.github                  = {}
+$settings.github.user             = `git config --global github.user`.rstrip
+$settings.github.token            = `git config --global github.token`.rstrip
+$settings.project_name            = nil
+$settings.projects_directory      = nil
+$settings.short_name              = nil
+$settings.sync                    = {}
+$settings.sync.host_name          = nil
+$settings.sync.projects_directory = nil
+$settings.sync.share_name         = nil
+
 # Global settings.
-config = config.deep_merge(YAML.load_file("#{ENV['HOME']}/.enzyme.yml") || {}) if File.exist?("#{ENV['HOME']}/.enzyme.yml")
-# Project settings.
-config = config.deep_merge(YAML.load_file("./.enzyme.yml") || {}) if File.exist?("./.enzyme.yml")
+system "touch #{$system_settings.config.global.path}" unless File.exist?($system_settings.config.global.path)
+$system_settings.config.global.exists = true
+$settings = $settings.deep_merge(YAML.load_file($system_settings.config.global.path) || {})
+
+# Sync server.
+if !$system_settings.sync_server.skip && $settings.sync.host_name && $settings.sync.share_name
 
-# Global settings object.
-$settings = Settings.new(config)
+  afp_url = "afp://#{$settings.sync.host_name}._afpovertcp._tcp.local/#{$settings.sync.share_name}"
 
-# Global flag for full stacktraces.
-$trace_errors = ARGV.delete('--trace')
+  # Set the sync server's path.
+  $system_settings.sync_server.path = "/Volumes/#{$settings.sync.share_name}"
+  # Set the organisation config file's path.
+  $system_settings.config.organisation.path = "/Volumes/#{$settings.sync.share_name}/.enzyme.yml"
 
-# Version number.
-$version = "0.1.4"
+  # Mount the sync server if it isn't already there.
+  unless File.directory?($system_settings.sync_server.path)
+    `mkdir #{$system_settings.sync_server.path}`
+    `mount -t afp #{afp_url} #{$system_settings.sync_server.path} > /dev/null` # > /dev/null is to suppress output
+    `rm -r \"/Volumes/#{$settings.sync.share_name}\"` if $? != 0
+  end
+
+  # If the volume has been mounted.
+  if File.directory?($system_settings.sync_server.path)
+    # Note the sync_server's existence.
+    $system_settings.sync_server.exists = true
+
+    # Organisation settings.
+    system "touch #{$system_settings.config.organisation.path}" unless File.exist?($system_settings.config.organisation.path)
+    $system_settings.config.organisation.exists = true
+  end
+
+  # Organisation settings.
+  if $system_settings.sync_server.exists && $system_settings.config.organisation.exists
+    # Merge the organisation settings.
+    $settings = $settings.deep_merge(YAML.load_file($system_settings.config.organisation.path) || {})
+    # Merge the global settings again (they have a higher priority).
+    $settings = $settings.deep_merge(YAML.load_file($system_settings.config.global.path) || {}) if $system_settings.config.global.exists
+  end
+
+end
+
+# Project settings.
+if File.exist?($system_settings.config.project.path)
+  # Note the project config file's existence.
+  $system_settings.config.project.exists = true
+  $settings = $settings.deep_merge(YAML.load_file($system_settings.config.project.path) || {})
+end

data/lib/string.rb

@@ -0,0 +1,5 @@
+class String
+  def is_i?
+    self.to_i.to_s == self.to_s
+  end
+end

metadata

@@ -1,143 +1,124 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: enzyme
-version: !ruby/object:Gem::Version 
-  hash: 19
-  prerelease: false
-  segments: 
-  - 0
-  - 1
-  - 4
-  version: 0.1.4
+version: !ruby/object:Gem::Version
+  version: 1.0.0.beta01
+  prerelease: 6
 platform: ruby
-authors: 
+authors:
 - Haydn Ewers
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-02-07 00:00:00 +10:30
-default_executable: enzyme
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
+date: 2012-05-07 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2157028440 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 0.9.2
+  type: :runtime
+  prerelease: false
+  version_requirements: *2157028440
+- !ruby/object:Gem::Dependency
   name: shoulda
+  requirement: &2156964760 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2156964760
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &2156963220 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
-  name: bundler
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2156963220
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &2156961960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 7
-        segments: 
-        - 1
-        - 5
-        - 2
+      - !ruby/object:Gem::Version
         version: 1.5.2
   type: :development
-  name: jeweler
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2156961960
+- !ruby/object:Gem::Dependency
+  name: rcov
+  requirement: &2156960780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  name: rcov
   prerelease: false
-  version_requirements: *id004
-description: Enzyme is a tool developed by Katalyst to make collaborating on projects easier.
+  version_requirements: *2156960780
+description: Enzyme is a tool to make collaborating on projects easier. Developed
+  by Katalyst Interactive.
 email: haydn@katalyst.com.au
-executables: 
+executables:
 - enzyme
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
-- README.rdoc
-files: 
+- README.md
+files:
 - VERSION
 - bin/enzyme
 - lib/commands/config.rb
 - lib/commands/create.rb
-- lib/commands/list.rb
+- lib/commands/join.rb
 - lib/commands/sync.rb
-- lib/commands/tasks.rb
-- lib/commands/view.rb
 - lib/enzyme.rb
+- lib/errors.rb
 - lib/hash.rb
-- lib/settings.rb
 - lib/setup.rb
+- lib/string.rb
 - LICENSE.txt
-- README.rdoc
+- README.md
 - test/helper.rb
 - test/test_enzyme.rb
-has_rdoc: true
 homepage: http://github.com/katalyst/enzyme
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -2649418028526874740
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Katalyst's project collaboration tool.
-test_files: 
+test_files:
 - test/helper.rb
 - test/test_enzyme.rb

data/README.rdoc

@@ -1,19 +0,0 @@
-= enzyme
-
-Description goes here.
-
-== Contributing to enzyme
- 
-* Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet
-* Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it
-* Fork the project
-* Start a feature/bugfix branch
-* Commit and push until you are happy with your contribution
-* Make sure to add tests for it. This is important so I don't break it in a future version unintentionally.
-* Please try not to mess with the Rakefile, version, or history. If you want to have your own version, or is otherwise necessary, that is fine, but please isolate to its own commit so I can cherry-pick around it.
-
-== Copyright
-
-Copyright (c) 2011 Haydn Ewers. See LICENSE.txt for
-further details.
-

data/lib/commands/list.rb

@@ -1,7 +0,0 @@
-module List extend self
-
-  def run(what=nil)
-    ARGV.reject { |x| x.start_with?("-") }
-  end
-
-end

data/lib/commands/tasks.rb

@@ -1,7 +0,0 @@
-module Tasks extend self
-
-  def run(user=nil)
-    ARGV.reject { |x| x.start_with?("-") }
-  end
-
-end

data/lib/commands/view.rb

@@ -1,7 +0,0 @@
-module View extend self
-
-  def run(what=nil)
-    ARGV.reject { |x| x.start_with?("-") }
-  end
-
-end

data/lib/settings.rb

@@ -1,44 +0,0 @@
-# Based on: http://mjijackson.com/2010/02/flexible-ruby-config-objects
-# Authors: Michael Jackson, Haydn Ewers
-class Settings
-
-  def initialize(data={})
-    @data = {}
-    update!(data)
-  end
-
-  def update!(data)
-    data.each do |key, value|
-      self[key] = value
-    end
-  end
-
-  def [](key)
-    @data[key.to_sym] || @data[key.to_i]
-  end
-
-  def []=(key, value)
-    if value.class == Hash
-      @data[key.to_sym] = Settings.new(value)
-    else
-      @data[key.to_sym] = value
-    end
-  end
-
-  def to_hash
-    @data.to_hash
-  end
-
-  def to_s
-    @data.to_s
-  end
-
-  def method_missing(sym, *args)
-    if sym.to_s =~ /(.+)=$/
-      self[$1] = args.first
-    else
-      self[sym]
-    end
-  end
-
-end