stastic 0.2.0 → 0.2.1

data/lib/stastic/commands/base.rb

@@ -91,6 +91,31 @@ module Stastic::Command
         puts
         exit
       end 
+
+      def print_site_info(site, marker = " ")
+        printf("%-2s%-30s http://%s\n", marker, site['name'], default_domain(site)) 
+        print_custom_domains(site)
+      end
+
+      def default_domain(site)
+        if site['domains']
+          domain = site['domains'].detect { |domain| domain['default'] }
+          return domain['host'] if domain
+        end
+      end
+
+      def print_custom_domains(site)
+        if site['domains']
+          domains = site['domains'].select{|domain| !domain['default']}
+          if !domains.empty?
+            domains.each do |domain|
+              printf("%-2s%30s http://%s\n", "", "--custom domain--", domain['host'])
+            end
+            puts 
+          end
+        end
+      end
+
   end
 end
 

data/lib/stastic/commands/create.rb

@@ -17,7 +17,6 @@ module Stastic::Command
         raise(Stastic::InvalidOptions) unless args.first == "--template"
         self.template = "default"
         self.name = args.last
-        puts self.template
       else
         raise(Stastic::InvalidOptions)
       end

data/lib/stastic/commands/help.rb

@@ -23,7 +23,7 @@ Available Commands
   stastic domains:add <domain>     # Add a domain to the site (example.com)
   stastic domains:remove <domain>  # Remove a domain from the site
   stastic preview                  # Start local HTTP server
-  stastic set site_root <path>     # Set the local path to the static files
+  stastic set site_root=<path>     # Set the path for your document root folder (defaults to ./)
 
         EOF
       end

data/lib/stastic/commands/list.rb

@@ -12,7 +12,7 @@ module Stastic::Command
 
         puts header
         response['sites'].each do |site| 
-          site_info(site, site['id'] == Stastic::Config.site_id ? "*" : " ")
+          print_site_info(site, site['id'] == Stastic::Config.site_id ? "*" : " ")
         end
         puts 
       end
@@ -28,10 +28,6 @@ Your Stastic Sites
         EOF
       end
 
-      def site_info(site, marker = " ")
-        printf("%-2s%-30s http://%s.stastic.com\n", marker, site['name'], site['name']) 
-      end
-
   end
 end
 

data/lib/stastic/commands/publish.rb

@@ -7,28 +7,40 @@ module Stastic::Command
 
     private
       def publish
-        puts "Detecting..."
+        print_pre_message("Detecting...")
         generator = Stastic::Generator.detect
-        puts "Found: #{generator.desc}"
+        printf("%s %s\n", "[OK]", generator.desc)
         
-        puts "Building..."
+        print_pre_message("Building...")
         generator.build
+        printf("[OK]\n")
 
-        puts "Packaging..."
+        print_pre_message("Packaging...")
         archive_path = generator.package
+        bytes = File.new(archive_path).stat.size 
+        printf("[OK] %.1f KB\n", bytes/1024.0)
 
-        print "Uploading..."
-        upload(archive_path)
+        print_pre_message("Uploading...")
+        s = Time.now
+        response = upload(archive_path)
+        printf("[OK] %.1f seconds\n", Time.now - s)
+        puts 
+        puts "Your site is published:"
+        print_site_info(response)
+        puts
 
       end
 
       def upload(archive_path)
-        print "Uploading your archive...\n"
         reponse = with_valid_site do
           Stastic::Client.publish(Stastic::Config.site_id, archive_path)
         end
-        puts "Complete\n"
       end
 
+      def print_pre_message(msg)
+        printf("%-33s", msg)
+        STDOUT.flush
+      end
+        
   end
 end

data/lib/stastic/generator.rb

@@ -6,7 +6,7 @@ module Stastic
   module Generator
     extend self
 
-    GENERATOR_TYPES = %w(jekyll default)
+    GENERATOR_TYPES = %w(jekyll staticmatic default)
     EXCLUDE_LIST = [
       ".stastic",
       ".git",

data/lib/stastic/generators/staticmatic.rb

@@ -0,0 +1,65 @@
+module Stastic::Generator
+  module Staticmatic
+    extend self
+
+    def desc
+      "Staticmatic Generator"
+    end
+
+    def detect
+      FileTest.exists?('config/site.rb') &&
+        FileTest.exists?("src/pages") && File.directory?("src/pages")
+    end
+
+    def site_root
+      Stastic::Config.site_root || "site"
+    end
+
+    def build
+      verify_gem
+      system("staticmatic build .")
+    end
+
+    def package
+      Stastic::Generator.package(site_root)
+    end
+
+    def preview
+      verify_gem
+      system("staticmatic preview .")
+    end
+
+    private
+
+      def gem_installed?
+        begin
+          gem "staticmatic"
+          true
+        rescue LoadError
+          false
+        end
+      end
+
+      def verify_gem
+        if !gem_installed?
+          puts install_instructions
+          exit
+        end
+      end
+
+      def install_instructions
+        <<-EOF
+The Staticmatic Gem can not be found on your GEM_PATH.
+GEM_PATH=#{ENV['GEM_PATH']}
+
+To Install Staticmatic:
+------------------
+
+  sudo gem install staticmatic
+
+        EOF
+      end 
+
+  end
+end
+

data/lib/stastic.rb

@@ -1,5 +1,5 @@
 module Stastic
 
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: stastic
 version: !ruby/object:Gem::Version 
-  hash: 23
   prerelease: false
   segments: 
   - 0
   - 2
-  - 0
-  version: 0.2.0
+  - 1
+  version: 0.2.1
 platform: ruby
 authors: 
 - Brian Smith
@@ -15,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-03-01 00:00:00 -08:00
+date: 2011-03-06 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 13
         segments: 
         - 1
         - 6
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 1
         segments: 
         - 1
         - 5
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -72,7 +68,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -106,6 +101,7 @@ files:
 - lib/stastic/generator.rb
 - lib/stastic/generators/default.rb
 - lib/stastic/generators/jekyll.rb
+- lib/stastic/generators/staticmatic.rb
 - lib/stastic.rb
 - lib/trollop.rb
 - bin/stastic
@@ -126,7 +122,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -135,7 +130,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 21
       segments: 
       - 1
       - 0