enzyme 1.0.0.beta01 → 1.0.0.beta02

data/VERSION

@@ -1 +1 @@
-1.0.0.beta01
+1.0.0.beta02

data/lib/commands/config.rb

@@ -9,11 +9,21 @@ module Config extend self
     value = ARGV.shift
     ARGV.each { |x| raise UnknownArgument.new(x) }
 
+    if file.nil?
+      file = $system_settings.config.project.exists ? "project" : "global"
+    else
+      file = file.to_s
+    end
+
+    raise ConfigFileNotFound.new($system_settings.config[file].path) unless $system_settings.config[file].exists
+
+    path = $system_settings.config[file].path
+
     unless value === nil
-      set(key, value, file)
-      puts "Set '#{key}' to '#{value}' in '#{$system_settings.config[file].path}'."
+      set(key, value, path)
+      puts "Set '#{key}' to '#{value}' in '#{path}'."
     else
-      val = get(key, file)
+      val = get(key, path)
       if val.is_a?(Array) || val.is_a?(Hash)
         puts val.to_hash.to_yaml
       else
@@ -23,17 +33,11 @@ module Config extend self
     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
-
   # 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
+  # - path: The path to the config file to get the setting from.
+  def get(key, path)
+    s = file ? (YAML.load_file(path) || {}) : $settings
     key.to_s.split('.').each do |o|
       return nil if s[o].nil?
       s = s[o]
@@ -44,17 +48,8 @@ module Config extend self
   # 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
-
+  # - path: The path to the config file to set the setting in.
+  def set(key, value, path)
     # FIXME: This could be simplified... heaps.
     new_settings = { 'enzyme_version' => $system_settings.version }
     current_hash = new_settings
@@ -68,12 +63,12 @@ module Config extend self
     $settings = $settings.deep_merge(new_settings)
 
     # Reload the settings to avoid including temporary settings.
-    settings = YAML.load_file($system_settings.config[file].path) || {}
+    settings = YAML.load_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)
+    write(path, settings)
   end
 
   def write(path, settings)

data/lib/commands/create.rb

@@ -31,13 +31,13 @@ module Create extend self
     commit_repo directory
     detach_repo directory
 
-    create_repo "#{directory}/shared"
-    commit_repo "#{directory}/shared"
-    detach_repo "#{directory}/shared"
+    create_repo "#{directory}/resources"
+    commit_repo "#{directory}/resources"
+    detach_repo "#{directory}/resources"
 
-    create_repo "#{directory}/working"
-    commit_repo "#{directory}/working"
-    detach_repo "#{directory}/working"
+    create_repo "#{directory}/production"
+    commit_repo "#{directory}/production"
+    detach_repo "#{directory}/production"
 
     puts "Created remote project at:"
     puts

data/lib/commands/join.rb

@@ -4,8 +4,8 @@ require 'commands/config'
 module Join extend self
 
   def run()
-    # --skip-shared
-    # --skip-working
+    # --skip-resources
+    # --skip-production
     ARGV.each { |x| raise UnknownOption.new(x) if x.start_with?("-") }
     project_name = ARGV.shift
     ARGV.each { |x| raise UnknownArgument.new(x) }
@@ -30,16 +30,16 @@ module Join extend self
     # 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.
+    # Clone the resources and production 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;"
+    system "git clone -q #{remote_directory}/resources #{local_directory}/resources"
+    system "cd #{local_directory}/resources; git checkout -q master;"
+    system "git clone -q #{remote_directory}/production #{local_directory}/production"
+    system "cd #{local_directory}/production; 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}")
+    # Create the user's production directory unless it's already there.
+    system "mkdir #{local_directory}/production/#{$settings.short_name}" unless File.directory?("#{local_directory}/production/#{$settings.short_name}")
 
     puts "Joined the '#{project_name}' project at:"
     puts

data/lib/commands/sync.rb

@@ -3,8 +3,8 @@ require 'enzyme'
 module Sync extend self
 
   def run
-    skip_shared = !!ARGV.delete("--skip-shared")
-    skip_working = !!ARGV.delete("--skip-working")
+    skip_resources = !!ARGV.delete("--skip-resources")
+    skip_production = !!ARGV.delete("--skip-production")
     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) }
@@ -26,11 +26,11 @@ module Sync extend self
     system "git pull > /dev/null"
     system "git push > /dev/null"
 
-    # SHARED
+    # RESOURCES
 
-    unless skip_shared
-      system "cd #{directory}/shared"
-      Dir.chdir("#{directory}/shared")
+    unless skip_resources
+      system "cd #{directory}/resources"
+      Dir.chdir("#{directory}/resources")
 
       system "git checkout -q . > /dev/null"
       system "git add . > /dev/null"
@@ -39,10 +39,10 @@ module Sync extend self
       system "git push > /dev/null"
     end
 
-    # WORKING
+    # PRODUCTION
 
-    system "cd #{directory}/working"
-    Dir.chdir("#{directory}/working")
+    system "cd #{directory}/production"
+    Dir.chdir("#{directory}/production")
 
     system "git add #{$settings.short_name} > /dev/null"
     system "git add -u > /dev/null"
@@ -62,7 +62,7 @@ Enzyme.register('sync', Sync) do
   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 '             The name of the project to sync. If the production 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:'
@@ -72,6 +72,6 @@ Enzyme.register('sync', Sync) do
   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 '             When the production directory is the root of a project you can run sync without any arguments.'
   puts
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: enzyme
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta01
+  version: 1.0.0.beta02
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000Z
+date: 2012-07-24 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2157028440 !ruby/object:Gem::Requirement
+  requirement: &2156181420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -21,10 +21,10 @@ dependencies:
         version: 0.9.2
   type: :runtime
   prerelease: false
-  version_requirements: *2157028440
+  version_requirements: *2156181420
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2156964760 !ruby/object:Gem::Requirement
+  requirement: &2156178320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156964760
+  version_requirements: *2156178320
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2156963220 !ruby/object:Gem::Requirement
+  requirement: &2156156060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2156963220
+  version_requirements: *2156156060
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2156961960 !ruby/object:Gem::Requirement
+  requirement: &2156138800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2156961960
+  version_requirements: *2156138800
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2156960780 !ruby/object:Gem::Requirement
+  requirement: &2156133660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2156960780
+  version_requirements: *2156133660
 description: Enzyme is a tool to make collaborating on projects easier. Developed
   by Katalyst Interactive.
 email: haydn@katalyst.com.au
@@ -106,7 +106,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2649418028526874740
+      hash: -3209188080824928551
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: