enzyme 0.1.2 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/lib/commands/config.rb

@@ -58,7 +58,7 @@ Enzyme.register(Config) do
   puts ''
   puts '### SYNOPSIS'
   puts ''
-  puts '    enzyme config [key [value [--global]]]'
+  puts '    enzyme config [<key> [<value> [--global]]]'
   puts ''
   puts '### EXAMPLES'
   puts ''

data/lib/commands/create.rb

@@ -16,25 +16,29 @@ module Create extend self
         when :koi
           koi(project_name)
         else
-          Enzyme.error("Unknown project type `#{project_type}`.")
+          raise "Unknown project type `#{project_type}`."
         end
       else
         base(project_name)
       end
+      puts "Complete."
     else
-      Enzyme.error("A project name must be given. For example: `enzyme create project_name`")
+      raise "A project name must be given. For example: `enzyme create project_name`"
     end
   end
 
   def base(project_name)
-    unless $settings.projects_directory
-      Enzyme.error("The `sync.projects_directory` setting is not set. Set it using `enzyme config projects_directory \"/Users/me/Projects\"`.")
-      return
-    end
+    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
+
+    puts "Creating the #{project_name} project at #{$settings.projects_directory}/#{project_name}..."
 
     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/client"
+    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"
 
     Dir.chdir("#{$settings.projects_directory}/#{project_name}")
@@ -44,24 +48,13 @@ module Create extend self
   end
 
   def koi(project_name)
-    Enzyme.error("Koi projects are not avaliable in this version of Enzyme (#{$version}).")
+    raise "Koi projects are not avaliable in this version of Enzyme (#{$version})."
   end
 
   def pms(project_name)
-    unless $settings.projects_directory
-      Enzyme.error("The `sync.projects_directory` setting is not set. Set it using `enzyme config projects_directory \"/Users/me/Projects\"`.")
-      return
-    end
-
-    unless $settings.github.user
-      Enzyme.error("The `sync.github.user` setting is not set. Set it using `enzyme config github.user \"me\"`.")
-      return
-    end
-
-    unless $settings.github.token
-      Enzyme.error("The `sync.github.token` setting is not set. Set it using `enzyme config github.token \"0123456789abcdef0123456789abcdef\"`.")
-      return
-    end
+    raise "The `sync.projects_directory` setting is not set. Set it using `enzyme config projects_directory \"/Users/me/Projects\" --global`." unless $settings.projects_directory
+    raise "The `sync.github.user` setting is not set. Set it using `enzyme config github.user \"me\" --global`." unless $settings.github.user
+    raise "The `sync.github.token` setting is not set. Set it using `enzyme config github.token \"0123456789abcdef0123456789abcdef\" --global`." unless $settings.github.token
 
     base(project_name)
 
@@ -85,7 +78,7 @@ Enzyme.register(Create) do
   puts ''
   puts '### SYNOPSIS'
   puts ''
-  puts '    enzyme create project_name [pms]'
+  puts '    enzyme create <project_name> [pms | koi]'
   puts ''
   puts '### EXAMPLES'
   puts ''

data/lib/commands/sync.rb

@@ -6,55 +6,38 @@ module Sync extend self
     ARGV.reject { |x| x.start_with?("-") }
     project_name = ARGV.shift || $settings.project_name
 
-    unless project_name
-      Enzyme.error("No project name specified. Ensure you're in the project's directory or set it specifically. Run `enzyme help sync` for help.")
-      return
-    end
-
-    unless $settings.sync.share_name
-      Enzyme.error("The `sync.share_name` setting is not set. Set it using `enzyme config sync.share_name \"Share Name\"`.")
-      return
-    end
-
-    unless $settings.sync.host
-      Enzyme.error("The `sync.host` setting is not set. Set it using `enzyme config sync.host \"Host._afpovertcp._tcp.local\"`.")
-      return
-    end
-
-    unless $settings.sync.projects_directory
-      Enzyme.error("The `sync.projects_directory` setting is not set. Set it using `enzyme config sync.projects_directory \"My Projects Directory\"`.")
-      return
-    end
-
-    unless $settings.sync.protected_directory
-      Enzyme.error("The `sync.protected_directory` setting is not set. Set it using `enzyme config sync.protected_directory \"my_directory\"`.")
-      return
-    end
-
-    unless $settings.sync.shared_directory
-      Enzyme.error("The `sync.shared_directory` setting is not set. Set it using `enzyme config sync.shared_directory \"our_shared_directory\"`.")
-      return
-    end
+    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.sync.protected_directory}/**' \"/Volumes/#{$settings.sync.share_name}/#{$settings.sync.projects_directory}/#{project_name}/\" '#{$settings.projects_directory}/#{project_name}/resources/'"
+    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.sync.protected_directory}/**' --exclude '*' '#{$settings.projects_directory}/#{project_name}/resources/' \"/Volumes/#{$settings.sync.share_name}/#{$settings.sync.projects_directory}/#{project_name}/\""
+    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}/\""
   end
 
 end
 
 Enzyme.register(Sync) do
   puts 'SYNC COMMAND'
-  puts '--------------'
+  puts '------------'
   puts ''
   puts '### SYNOPSIS'
   puts ''
-  puts '    enzyme sync [project_name]'
+  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 ''

data/lib/enzyme.rb

@@ -51,16 +51,16 @@ module Enzyme extend self
       puts ''
       puts '### Commands'
       puts ''
-      puts '    enzyme config [key [value [--global]]]'
-      puts '    enzyme create project_name [type]'
-      # puts '    enzyme join project_name'
-      puts '    enzyme sync [project_name]'
+      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 '    enzyme help [<command>]'
+      puts '    enzyme [<command>] --help'
+      puts '    enzyme [<command>] -h'
       puts ''
       puts '### Debugging'
       puts ''

data/lib/setup.rb

@@ -24,4 +24,4 @@ $settings = Settings.new(config)
 $trace_errors = ARGV.delete('--trace')
 
 # Version number.
-$version = "0.1.2"
+$version = "0.1.3"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: enzyme
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: false
   segments: 
   - 0
   - 1
-  - 2
-  version: 0.1.2
+  - 3
+  version: 0.1.3
 platform: ruby
 authors: 
 - Haydn Ewers
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-18 00:00:00 +10:30
+date: 2011-01-19 00:00:00 +10:30
 default_executable: enzyme
 dependencies: 
 - !ruby/object:Gem::Dependency