siterest 0.1.0.pre1 → 0.1.0.pre4

data/VERSION

@@ -1 +1 @@
-0.1.0.pre1
+0.1.0.pre4

data/lib/siterest/command.rb

@@ -8,8 +8,6 @@ module Siterest
       self.command, *self.args = args
       
       self.command ||= 'render'
-      
-      
     end
 
     def put(string, newline=true)
@@ -21,7 +19,7 @@ module Siterest
       puts "#{self.command} Command"
       
       unless File.exist?(config_file)
-        config
+        setup
       else
         self.send(command)
       end
@@ -32,7 +30,9 @@ module Siterest
       Server.run! :host => 'localhost', :port => 8888
     end
     
-    def config
+    def setup
+      FileUtils.mkdir_p("#{ENV['HOME']}/.siterest/")
+      
       put "Let's setup your SiteRest, visit follow url if you don't have a account"
       put "http://www.siterest.com"
 
@@ -47,7 +47,7 @@ module Siterest
       save_config(:api_token => token, :server_url => server)
     end
     
-    def setup
+    def data
       FileUtils.cp_r(File.dirname(__FILE__) + '/../../site/data', 'data')
     end
     
@@ -79,27 +79,41 @@ module Siterest
       end
     end
     
+    def help
+      put <<-TEXT
     
-    def client
-      Client.new
+    Siterest commands
+    =====================
+
+    setup       # Setup siterest access token
+    push [site] # Push local design to siterest site (use subdomain) you specified.
+    pull [site] # Pull a siterest site (use subdomain) design (assets and templates) to current folder
+    data        # Generate a example data folder
+
+    TEXT
     end
     
-    def home_directory
-      ENV['HOME']
-    end
+    private
+      def client
+        Client.new
+      end
     
-    def config_file
-      "#{ENV['HOME']}/.siterest/config.yml"
-    end
+      def home_directory
+        ENV['HOME']
+      end
     
-    def save_config(config)
-      File.open(config_file, "w") do|file| 
-        file.puts(config.to_yaml) 
+      def config_file
+        "#{ENV['HOME']}/.siterest/config.yml"
       end
-    end
     
-    def load_config
-      YAML.load_file(config_file)
-    end
+      def save_config(config)
+        File.open(config_file, "w") do|file| 
+          file.puts(config.to_yaml) 
+        end
+      end
+    
+      def load_config
+        YAML.load_file(config_file)
+      end
   end
 end

data/lib/siterest/template/objects/page.rb

@@ -13,6 +13,12 @@ class Page < OpenStruct
     pages
   end
   
+  def self.find(permalink)
+    path = Dir.glob("data/pages/#{permalink}.md").first or raise "Page not found"
+
+    self.build(path)
+  end
+  
   def self.recursive_build(start_path, cache)
     Dir.glob("#{start_path}/*").map do |path|
       if File.directory?(path)
@@ -31,27 +37,17 @@ class Page < OpenStruct
     attributes = build_content(path)
     url = path.gsub(%r(data/pages/(.+).md)){|m| $1 }
     permalink = url.split('/').last
-
-    self.new attributes.merge(:url => url, :permalink => permalink)
-  end
-  
-  def self.find(permalink)
-    path = Dir.glob("data/pages/#{permalink}.md").first or raise "Page not found"
-    
-    attributes = build_content(path)
-    url = path.gsub(%r(data/pages/(.+).md)){|m| $1 }
-    permalink = url.split('/').last
     
     if permalink == 'home'
-      permalink = nil
       url = ''
     end
 
-    url = "/" + url
-    
-    self.new attributes.merge(:url => url, :permalink => permalink)
+    self.new attributes.merge(
+      'url' => "/"+ url, 
+      'permalink' => permalink
+    )
   end
-  
+
   def self.build_content(filename)
     source = File.read(filename)
     meta, content = source.split(/---\n(.+?)---/sm)[1,2]

data/lib/siterest.rb

@@ -1,7 +1,7 @@
 require "rubygems"
 
-require "bundler"
-Bundler.setup
+# require "bundler"
+# Bundler.setup
 
 require 'yaml'
 require 'h2o'
@@ -40,13 +40,13 @@ module Siterest
   end
 
   def self.token
-    @token ||= config[:api_token] 
+    config[:api_token] 
   rescue
     raise "You need to setup API key, run siterest setup"
   end
   
   def self.url
-    @token ||= config[:server_url] 
+    config[:server_url] 
   end
   
   def self.site_resource_url

data/readme.md

@@ -4,83 +4,25 @@ SiteRest client - building website is now happier
  - siterest command with various options to communicate to the server
 
 
+Requirement
+---
 
 API Token
-  
-API URL
-
-Access core resources
-  http://api.siterest.com/
-
-Access site resources 
-
-  http://api.siterest.com/sites/{subdomain}/templates
 
+  You will need a active API token
+  
 
 Commands
-===
-
-setup
 ---
 
-    > siterest setup
-
-    Enter your SiteRest credenticals
-    Email: [subjective@gmail.com]
-    Password: [*******]
-
-then credential and config are saved to following config file
-
-    ~/.siterest.yml
-      current : taylorluk
-      email : [subjective@gmail.com]
-
-design:pull [name]
-----------------
-
-first time
-
-    git clone git@siterest.com:sitename
-
-pull latest content from the website
+### config
 
-    git reset --hard
-    git pull git@siterest.com:sitename
 
-conflict:
+### setup
 
-  overwrite local copy of file if it is already on remote server.
+Setup default sample data folder
 
-design:push [name]
-------------------
 
-push all local changes to remote server
+### pull :subdomain
 
-    git add .
-    git commit -m "Site update [messages]"
-    
-    git push git@siterest.com:sitename
-
-
-
-Low priority features
-==================
-
-
-create
-------------------
-
-    > siterest create
-    We are going to create new website for you.
-
-    Title: My new we website
-    Subdomain: something
-
-    git-config username, email
-
-
-backup
----
-
-import
----
+### push :subdomain

data/site/data/articles/2008-04-24-my-first-blog-post.md

@@ -10,3 +10,6 @@ Hello world
 What every you do and don't panic
 
 
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.
+
+Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.

data/siterest.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{siterest}
-  s.version = "0.1.0.pre1"
+  s.version = "0.1.0.pre4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Taylor luk"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: siterest
 version: !ruby/object:Gem::Version 
-  hash: -1876988184
+  hash: -1876988169
   prerelease: true
   segments: 
   - 0
   - 1
   - 0
-  - pre1
-  version: 0.1.0.pre1
+  - pre4
+  version: 0.1.0.pre4
 platform: ruby
 authors: 
 - Taylor luk