machined 0.9.3 → 1.0.0

data/lib/machined/cli.rb

@@ -1,14 +1,17 @@
 require 'active_support/core_ext/hash/keys'
 require 'active_support/core_ext/hash/slice'
+require 'shellwords'
 require 'thor'
 
 module Machined
   class CLI < Thor
     include Thor::Actions
-    
+
+    SAVED_OPTIONS_FILE = '.machined'
+
     default_task :help
     source_root  File.expand_path('../templates', __FILE__)
-    
+
     class_option 'root', :aliases => '-r',
       :desc => 'Path to the root directory of the project',
       :default => '.'
@@ -21,19 +24,19 @@ module Machined
     class_option 'environment', :aliases => '-e',
       :desc => 'Sets the environment',
       :default => 'development'
-    
+
     desc 'compile', 'Compiles the site from the source files'
     def compile
       machined.compile
     end
     map %w(c build b) => :compile
-    
+
     desc 'new SITE_NAME', 'Generates a new site with the give name'
     def new(site_name)
       directory 'site', site_name
     end
     map %w(n generate g) => :new
-    
+
     desc 'server', 'Runs a local Rack based web server'
     method_option :port, :aliases => '-p',
       :desc => 'Serve at the given port',
@@ -53,25 +56,25 @@ module Machined
       Rack::Server.start rack_options
     end
     map %w(s rackup r) => :server
-    
+
     desc 'version', 'Prints out the version'
     def version
       say VERSION
     end
     map %w(v -v --version) => :version
-    
+
     protected
-    
+
     def machined
       @machined ||= Environment.new machined_options
     end
-    
+
     # Returns the current environment, using the 'RACK_ENV' variable
     # if set.
     def environment # :nodoc
       ENV['RACK_ENV'] || options['environment']
     end
-    
+
     # Returns the options needed for setting up
     # Machined environment.
     def machined_options # :nodoc:
@@ -79,21 +82,43 @@ module Machined
         machined_options[:environment] = environment
       end
     end
-    
+
     # Returns the options needed for setting up the Rack server.
     def rack_options # :nodoc:
       symbolized_options(:port, :host, :server, :daemonize, :pid).tap do |rack_options|
         rack_options[:environment] = environment
-        rack_options[:Port]        = rack_options.delete :port
-        rack_options[:Host]        = rack_options.delete :host
-        rack_options[:app]         = machined
+        rack_options[:Port] = rack_options.delete :port
+        rack_options[:Host] = rack_options.delete :host
+        rack_options[:app] = machined
       end
     end
-    
+
     # Returns a mutable options hash with symbolized keys.
     # Optionally, returns only the keys given.
     def symbolized_options(*keys) # :nodoc:
-      {}.merge(options).symbolize_keys.slice(*keys)
+      @symbolized_options ||= begin
+        opts = {}.merge(options)
+        opts.merge! saved_options if saved_options?
+        opts.symbolize_keys
+      end
+      @symbolized_options.slice(*keys)
+    end
+
+    # Returns the parsed saved options.
+    def saved_options
+      parse_options File.read(SAVED_OPTIONS_FILE)
+    end
+
+    # Returns true if there's a saved options file in the project
+    def saved_options?
+      File.exist? SAVED_OPTIONS_FILE
+    end
+
+    # Use Thor::Options to parse the given options String (or Array).
+    def parse_options(options)
+      options = Shellwords.split(options) unless options.is_a?(Array)
+      parser = Thor::Options.new(self.class.class_options)
+      parser.parse(options)
     end
   end
 end

data/lib/machined/templates/site/Gemfile.tt

@@ -2,7 +2,7 @@ source :rubygems
 
 gem 'machined', '<%= Machined::VERSION %>'
 
-gem 'sass', '~> 3.1'
+gem 'sass', '~> 3.2'
 gem 'coffee-script', '~> 2.2'
 
 group :production do

data/lib/machined/templates/site/machined.rb

@@ -1,10 +1,10 @@
 if environment.production?
   # Compress javascripts and stylesheets
   config.compress = true
-  
+
   # Generate digests for assets URLs
   # config.digest_assets = true
-  
+
   # Create gzipped versions of javascripts and stylesheets
   # config.gzip_assets = true
 end

data/lib/machined/version.rb

@@ -1,3 +1,3 @@
 module Machined
-  VERSION = '0.9.3'
+  VERSION = '1.0.0'
 end

data/machined.gemspec

@@ -19,8 +19,8 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency             'rack',              '~> 1.5.0'
-  s.add_dependency             'sprockets',         '~> 2.6.0'
-  s.add_dependency             'sprockets-helpers', '~> 0.7.1'
+  s.add_dependency             'sprockets',         '~> 2.9.0'
+  s.add_dependency             'sprockets-helpers', '~> 0.8.0'
   s.add_dependency             'sprockets-sass',    '~> 0.9.1'
   s.add_dependency             'padrino-helpers',   '~> 0.10.6'
   s.add_dependency             'activesupport',     '~> 3.2.3'

data/spec/machined/cli_spec.rb

@@ -7,8 +7,17 @@ describe Machined::CLI do
       Machined::Environment.should_receive(:new).with(:root => '.', :output_path => 'public', :environment => 'production', :config_path => 'machined.rb').and_return(machined)
       machined_cli 'compile -e production'
     end
+
+    it 'uses saved options' do
+      within_construct do |c|
+        c.file '.machined', '--root app --output-path site --config-path app.rb'
+        machined.should_receive(:compile)
+        Machined::Environment.should_receive(:new).with(:root => 'app', :output_path => 'site', :environment => 'production', :config_path => 'app.rb').and_return(machined)
+        machined_cli 'compile -e production'
+      end
+    end
   end
-  
+
   describe '#new' do
     it 'creates a machined site directory' do
       within_construct do |c|
@@ -16,7 +25,7 @@ describe Machined::CLI do
         File.directory?('my_site').should be_true
       end
     end
-    
+
     it 'creates source directories' do
       within_construct do |c|
         machined_cli 'new my_site'
@@ -27,14 +36,14 @@ describe Machined::CLI do
         File.directory?('my_site/assets/stylesheets').should be_true
       end
     end
-    
+
     it 'creates an output path' do
       within_construct do |c|
         machined_cli 'new my_site'
         File.directory?('my_site/public').should be_true
       end
     end
-    
+
     it 'creates an default index page' do
       within_construct do |c|
         machined_cli 'new my_site'
@@ -47,7 +56,7 @@ describe Machined::CLI do
         CONTENT
       end
     end
-    
+
     it 'creates a default layout' do
       within_construct do |c|
         machined_cli 'new my_site'
@@ -67,39 +76,39 @@ describe Machined::CLI do
         CONTENT
       end
     end
-    
+
     it 'creates a default javascript file' do
       within_construct do |c|
         machined_cli 'new my_site'
         File.exist?('my_site/assets/javascripts/application.js.coffee').should be_true
       end
     end
-    
+
     it 'creates a default stylesheet file' do
       within_construct do |c|
         machined_cli 'new my_site'
         File.exist?('my_site/assets/stylesheets/application.css.scss').should be_true
       end
     end
-    
+
     it 'creates a default Gemfile' do
       within_construct do |c|
         machined_cli 'new my_site'
         File.read('my_site/Gemfile').should == <<-CONTENT.unindent
           source :rubygems
-          
+
           gem 'machined', '#{Machined::VERSION}'
-          
-          gem 'sass', '~> 3.1'
+
+          gem 'sass', '~> 3.2'
           gem 'coffee-script', '~> 2.2'
-          
+
           group :production do
             gem 'uglifier', '~> 1.0'
           end
         CONTENT
       end
     end
-    
+
     it 'creates a default config file' do
       within_construct do |c|
         machined_cli 'new my_site'
@@ -107,21 +116,21 @@ describe Machined::CLI do
           if environment.production?
             # Compress javascripts and stylesheets
             config.compress = true
-            
+
             # Generate digests for assets URLs
             # config.digest_assets = true
-            
+
             # Create gzipped versions of javascripts and stylesheets
             # config.gzip_assets = true
           end
-          
+
           helpers do
             # Define helper methods here
           end
         CONTENT
       end
     end
-    
+
     it 'creates a default rackup file' do
       within_construct do |c|
         machined_cli 'new my_site'
@@ -132,16 +141,26 @@ describe Machined::CLI do
       end
     end
   end
-  
+
   describe '#server' do
-    it 'should start a Rack server' do
+    it 'starts a Rack server' do
       app = machined
       Machined::Environment.should_receive(:new).with(:root => '.', :output_path => 'site', :environment => 'production', :config_path => 'machined.rb').and_return(app)
       Rack::Server.should_receive(:start).with(hash_including(:app => app, :environment => 'production', :Port => 5000))
       machined_cli 'server -o site -e production -p 5000'
     end
+
+    it 'uses saved options' do
+      within_construct do |c|
+        c.file '.machined', '--root app --output-path site --config-path app.rb'
+        app = machined
+        Machined::Environment.should_receive(:new).with(:root => 'app', :output_path => 'site', :config_path => 'app.rb', :environment => 'development').and_return(app)
+        Rack::Server.should_receive(:start).with(hash_including(:app => app))
+        machined_cli 'server'
+      end
+    end
   end
-  
+
   describe '#version' do
     it 'prints out the current version number' do
       output = machined_cli 'version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: machined
 version: !ruby/object:Gem::Version
-  version: 0.9.3
+  version: 1.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: 2.9.0
 - !ruby/object:Gem::Dependency
   name: sprockets-helpers
   requirement: !ruby/object:Gem::Requirement
@@ -50,7 +50,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -58,7 +58,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.7.1
+        version: 0.8.0
 - !ruby/object:Gem::Dependency
   name: sprockets-sass
   requirement: !ruby/object:Gem::Requirement
@@ -428,7 +428,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3230074138858488384
+      hash: -3708924351974803974
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -437,7 +437,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3230074138858488384
+      hash: -3708924351974803974
 requirements: []
 rubyforge_project: machined
 rubygems_version: 1.8.23