soupcms-cli 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 96ab0c89df4305acdefb49bc2016f9341f593d84
-  data.tar.gz: aae155db0adbefd86c38d8e17ab2c051b95add7e
+  metadata.gz: 88ef906109933b28d1cfbf6180ccd1ed45868dc5
+  data.tar.gz: b3a6e1c4612aee3588b5f83fc3891261d9f6e62d
 SHA512:
-  metadata.gz: b5a032a84906fab09ef3334916ac914fc3178defd6621f5c2b3007c9ea95913f1078e26b9d52afe24c110bb12567557c7906855cb4e26946db12f3b3e708cd86
-  data.tar.gz: d45210a25e4088abe438ab14e1b1e736178120198204edc4390a7b400539693d13f2b3958f0b89368cb9deb591fee35c12bce73c92ee08340a07e55b34c74480
+  metadata.gz: 9f5435351543fe6ba8d0eac5702d62985547ff8ba11c3cf7b2dde0cf890d152687e6a4de7a2d3febaa2252b9fe1936d3d70b99c5ffb45778344b7c9e433ac20a
+  data.tar.gz: e140980604369a5de75760584bcf8869f265a35966a85f59b5d3e1c4cbbae00ab61dc7bd61e19b72524eccb57d3f40b6fef6fff3259dce3b476f79b55155edbb

data/.travis.yml

@@ -1,5 +1,4 @@
 language: ruby
 rvm:
   - 2.0.0
-  - 2.1.0
   - 2.1.1

data/Gemfile

@@ -3,7 +3,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :test do
-  gem 'rspec', '~> 3.0.0.beta2'
+  gem 'rspec', '~> 3.0.0.rc1'
   gem 'rake'
   gem 'rack-test'
 end

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    soupcms-cli (0.5.3)
+    soupcms-cli (0.5.4)
       bson_ext (~> 1.10)
       mongo (~> 1.10)
       thor (~> 0.19)
@@ -9,28 +9,28 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    bson (1.10.0)
-    bson_ext (1.10.0)
-      bson (~> 1.10.0)
+    bson (1.10.1)
+    bson_ext (1.10.1)
+      bson (~> 1.10.1)
     diff-lcs (1.2.5)
-    mongo (1.10.0)
-      bson (~> 1.10.0)
+    mongo (1.10.1)
+      bson (~> 1.10.1)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
-    rake (10.2.2)
-    rspec (3.0.0.beta2)
-      rspec-core (= 3.0.0.beta2)
-      rspec-expectations (= 3.0.0.beta2)
-      rspec-mocks (= 3.0.0.beta2)
-    rspec-core (3.0.0.beta2)
-      rspec-support (= 3.0.0.beta2)
-    rspec-expectations (3.0.0.beta2)
+    rake (10.3.2)
+    rspec (3.0.0.rc1)
+      rspec-core (= 3.0.0.rc1)
+      rspec-expectations (= 3.0.0.rc1)
+      rspec-mocks (= 3.0.0.rc1)
+    rspec-core (3.0.0.rc1)
+      rspec-support (= 3.0.0.rc1)
+    rspec-expectations (3.0.0.rc1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (= 3.0.0.beta2)
-    rspec-mocks (3.0.0.beta2)
-      rspec-support (= 3.0.0.beta2)
-    rspec-support (3.0.0.beta2)
+      rspec-support (= 3.0.0.rc1)
+    rspec-mocks (3.0.0.rc1)
+      rspec-support (= 3.0.0.rc1)
+    rspec-support (3.0.0.rc1)
     thor (0.19.1)
 
 PLATFORMS
@@ -39,5 +39,5 @@ PLATFORMS
 DEPENDENCIES
   rack-test
   rake
-  rspec (~> 3.0.0.beta2)
+  rspec (~> 3.0.0.rc1)
   soupcms-cli!

data/README.md

@@ -1,4 +1,4 @@
-# sopuCMS::Cli
+# soupCMS command line tool
 
 soupCMS is still in alpha and experiment stage. So please use it with caution. If you face any problem raise issue with error details and I will be happy to help.
 
@@ -7,5 +7,14 @@ soupCMS is still in alpha and experiment stage. So please use it with caution. I
 [Hosting soupCMS](http://blog.soupcms.com/posts/deploying-on-heroku) for more details on how to host your website built using soupCMS.
 
 
+## Release
+
+### v0.5.3  (24 April, 2014)
+
+1. fixed issue with generating config.ru without hosting support
+2. by default now new application creates new directory, use '-t' option to skip top level directory
+
+
+
 
 

data/lib/soupcms/cli/model/base.rb

@@ -45,7 +45,7 @@ module SoupCMS
 
         def conn
           return @conn if @conn
-          mongo_uri = ENV["MONGODB_URI_#{app_name}"] || "mongodb://localhost:27017/#{app_name}"
+          mongo_uri = ENV["MONGODB_URI_#{app_name}"] || ENV["MONGOLAB_URI"] || "mongodb://localhost:27017/#{app_name}"
           @conn = Mongo::MongoClient.from_uri(mongo_uri)
         end
 

data/lib/soupcms/cli/version.rb

@@ -1,5 +1,5 @@
 module Soupcms
   module Cli
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

data/lib/soupcms/soupcms_cli.rb

@@ -38,15 +38,22 @@ class SoupCMSCLI < Thor
     top_dir = options.skip_dir? ? '.' : name
     data_folder = "#{top_dir}/data/#{name}"
     if configs[:blog]
-      template 'lib/templates/pages/blog-post.yml',"#{data_folder}/pages/blog-post.yml"
+      template 'lib/templates/pages/post.yml',"#{data_folder}/pages/post.yml"
       template 'lib/templates/pages/posts.yml',"#{data_folder}/pages/posts.yml"
     end
     copy_file 'lib/templates/public/favicon.png', "#{top_dir}/public/favicon.png"
+    copy_file 'lib/templates/public/favicon.ico', "#{top_dir}/public/favicon.ico"
     copy_file 'lib/templates/public/common/stylesheets/_custom-variables.scss', "#{top_dir}/public/common/stylesheets/_custom-variables.scss"
 
     template 'lib/templates/schemaless/footer.yml',"#{data_folder}/schemaless/footer.yml"
     template 'lib/templates/schemaless/navigation.yml',"#{data_folder}/schemaless/navigation.yml"
-    template 'lib/templates/schemaless/social-toolbar.yml',"#{data_folder}/schemaless/social-toolbar.yml"
+    template 'lib/templates/schemaless/author.yml',"#{data_folder}/schemaless/author.yml"
+
+    template 'lib/templates/modules/author.yml',"#{data_folder}/modules/author.yml"
+    template 'lib/templates/modules/navigation.yml',"#{data_folder}/modules/navigation.yml"
+    template 'lib/templates/modules/projects.yml',"#{data_folder}/modules/projects.yml"
+    template 'lib/templates/modules/tag-cloud.yml',"#{data_folder}/modules/tag-cloud.yml"
+    template 'lib/templates/modules/share-this.yml',"#{data_folder}/modules/share-this.yml"
 
     template 'lib/templates/pages/default.yml',"#{data_folder}/pages/default.yml"
     template 'lib/templates/pages/home.yml',"#{data_folder}/pages/home.yml"
@@ -64,7 +71,6 @@ class SoupCMSCLI < Thor
       end
     end
 
-
     create_file "#{top_dir}/data/#{name}/_config.yml", YAML.dump(JSON.parse(configs.to_json))
   end
 
@@ -72,7 +78,7 @@ class SoupCMSCLI < Thor
   def post(name, top_dir = '.')
     configs[:name] = name
     configs[:title] = ask('Title for the new post? (20 to 30 char) :', :green)
-    sanitize_title = configs[:title].gsub(' ','-').gsub('\'','').gsub(',','').downcase   #TODO: proper sanitization
+    sanitize_title = sanatize(configs[:title])
     configs[:sanitize_title] = sanitize_title
     tags = ask('Tags as comma separated list:', :green)
     configs[:tags] = tags.split(',')
@@ -129,6 +135,11 @@ class SoupCMSCLI < Thor
     File.join(File.dirname(__FILE__), '../..')
   end
 
+  private
+  def sanatize(value)
+    value.gsub(/\W/, '-').gsub('--','-').downcase
+  end
+
 
 end
 

data/lib/templates/Gemfile

@@ -1,7 +1,7 @@
 source 'https://rubygems.org'
 ruby '2.1.1'
 
-gem 'soupcms-cli'
+gem 'soupcms-cli', github: 'soupcms/soupcms-cli'
 gem 'soupcms-common', github: 'soupcms/soupcms-common'
 gem 'soupcms-core', github: 'soupcms/soupcms-core'
 gem 'soupcms-api', github: 'soupcms/soupcms-api'

data/lib/templates/blog/my-first-post.md

@@ -2,11 +2,12 @@
 # blog post attributes in front matter format
 tags: [<%= configs[:tags].join(",") %>]
 title: <%= configs[:title] %>
-publish_datetime: 2014-01-01T00:00:07.0Z
+publish_datetime: 2014-01-01T00:00:07.0Z            # change date in future for draft article
 description: Write post description here...
+#slug: change-it-to-define-slug-for-the-post        # default slug is sanitized file name
 ---
 
-# Markdown documentation
+## Markdown documentation
 
 This is [markdown template](http://kramdown.gettalong.org/index.html) and quick reference of the markdown language is available [here](http://kramdown.gettalong.org/quickref.html).
 

data/lib/templates/modules/author.yml

@@ -0,0 +1,11 @@
+---
+  doc_id: author
+
+  recipes:
+    -
+      type: http
+      url: "#{context.application.soupcms_api_url}/schemaless/doc_id/author"
+      return: author
+  template:
+    type: slim
+    name: bootstrap/author

data/lib/templates/modules/navigation.yml

@@ -0,0 +1,13 @@
+---
+  doc_id: navigation
+
+  recipes:
+    -
+      type: soupcms-api
+      model: schemaless
+      match:
+        doc_id: navigation
+      return: navigation
+  template:
+    type: slim
+    name: bootstrap/navigation

data/lib/templates/modules/projects.yml

@@ -0,0 +1,14 @@
+---
+  doc_id: projects
+
+  recipes:
+    -
+      type: http
+      url: "#{context.application.soupcms_api_url}/schemaless/doc_id/author"
+      get: "result['projects']"
+      return: articles
+  template:
+    type: slim
+    name: bootstrap/list-view
+    config:
+      title: My Projects

data/lib/templates/modules/share-this.yml

@@ -0,0 +1,13 @@
+---
+  doc_id: share-this
+
+  recipes:
+    -
+      type: soupcms-api
+      model: "/#{context.model_name}/slug/#{context.slug}"
+      return: article
+  template:
+    type: slim
+    name: bootstrap/share-this
+    config:
+      title: Share

data/lib/templates/modules/tag-cloud.yml

@@ -0,0 +1,11 @@
+---
+  doc_id: tag-cloud
+
+  recipes:
+    -
+      type: soupcms-api
+      url: posts/tag-cloud
+      return: tag-cloud
+  template:
+    type: slim
+    name: bootstrap/tag-cloud

data/lib/templates/pages/default.yml

@@ -15,17 +15,7 @@
     -
       name: header
       modules:
-        -
-          recipes:
-            -
-              type: soupcms-api
-              model: schemaless
-              match:
-                name: navigation
-              return: navigation
-          template:
-            type: slim
-            name: bootstrap/navigation
+        - navigation
         -
           recipes:
             -
@@ -44,11 +34,11 @@
           recipes:
             -
               type: http
-              url: "#{context.application.soupcms_api_url}/schemaless/name/social-toolbar"
-              return: social-toolbar
+              url: "#{context.application.soupcms_api_url}/schemaless/doc_id/author"
+              return: author
           template:
             type: slim
-            name: bootstrap/social-toolbar
+            name: bootstrap/author
         -
           recipes:
             -
@@ -67,7 +57,7 @@
               type: soupcms-api
               model: schemaless
               match:
-                name: footer
+                doc_id: footer
               return: footer
           template:
             type: slim

data/lib/templates/pages/{blog-post.yml → post.yml}

@@ -5,16 +5,10 @@
     - 
       name: sidebar
       modules: 
-        - 
-          recipes: 
-            - 
-              type: http
-              url: "#{context.application.soupcms_api_url}/schemaless/name/social-toolbar"
-              return: social-toolbar
-          template: 
-            type: slim
-            name: bootstrap/social-toolbar
-        - 
+        - author
+        - projects
+        - share-this
+        -
           recipes: 
             - 
               type: soupcms-api
@@ -37,15 +31,7 @@
             name: bootstrap/table-of-content
             config: 
               title: Contents
-        - 
-          recipes: 
-            - 
-              type: soupcms-api
-              url: posts/tag-cloud
-              return: tag-cloud
-          template: 
-            type: slim
-            name: bootstrap/tag-cloud
+        - tag-cloud
         - 
           recipes: 
             - 
@@ -54,7 +40,7 @@
               fields: 
                 - title
                 - slug
-              limit: 5
+              limit: 0
               return: articles
           template: 
             type: slim

data/lib/templates/schemaless/author.yml

@@ -0,0 +1,14 @@
+---
+  doc_id: author
+
+  name: <%= configs[:name] %>
+  bio:
+    - Author short bio like twitter line 1
+    - bio line 2
+    - as many lines as you want
+    - fully optional
+  thumbnail: http://www.gravatar.com/avatar/f40c60ffb60255ae89e75ccbb8eb303c.png
+  email: <%= configs[:name] %>@email.com
+  twitter_handle: <%= configs[:name] %>
+  github_username: <%= configs[:name] %>
+

data/lib/templates/schemaless/footer.yml

@@ -1,5 +1,5 @@
 ---
-  name: footer
+  doc_id: footer
 
   copyright: "© 2014"
   links: 

data/lib/templates/schemaless/navigation.yml

@@ -1,8 +1,8 @@
 ---
-  name: navigation
+  doc_id: navigation
 
   logo:
-    font_icon: fa fa-magic
+    font_icon: fa fa-home
     text: "<%= configs[:display_name] %>"
     link:
       url: home

data/lib/templates/single-app-config.ru

@@ -6,7 +6,7 @@ require 'soupcms/api'
 
 SoupCMS::Common::Strategy::Application::SingleApp.configure do |app|
   app.app_name = "<%= configs[:name] %>"
-  app.display_name = "<%= configs[:description] %>"
+  app.display_name = "<%= configs[:display_name] %>"
   <%- if configs[:site_name] %>
   if ENV['RACK_ENV'] == 'production'
     app.soupcms_api_url = '<%= configs[:site_name] %>/api'
@@ -32,8 +32,8 @@ end
 PUBLIC_DIR = File.join(File.dirname(__FILE__), 'public')
 map '/assets' do
   sprockets = SoupCMSCore.config.sprockets
-  sprockets.append_path SoupCMS::Core::Template::Manager::DEFAULT_TEMPLATE_DIR
   sprockets.append_path PUBLIC_DIR
+  sprockets.append_path SoupCMS::Core::Template::Manager::DEFAULT_TEMPLATE_DIR
   Sprockets::Helpers.configure do |config|
     config.environment = sprockets
     config.prefix = '/assets'
@@ -48,8 +48,11 @@ map '/' do
     config.application_strategy = SoupCMS::Common::Strategy::Application::SingleApp
   end
   soup_cms_rack_app = SoupCMSRackApp.new
+  soup_cms_rack_app.set_redirect('http://localhost:9292','http://localhost:9292/home')
+  soup_cms_rack_app.set_redirect('http://localhost:9292/','http://localhost:9292/home')
   <%- if configs[:site_name] %>
   soup_cms_rack_app.set_redirect('<%= configs[:site_name] %>','<%= configs[:site_name] %>/home')
+  soup_cms_rack_app.set_redirect('<%= configs[:site_name] %>/','<%= configs[:site_name] %>/home')
   <%- end %>
   run soup_cms_rack_app
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soupcms-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Sunit Parekh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-24 00:00:00.000000000 Z
+date: 2014-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -88,18 +88,24 @@ files:
 - lib/templates/Gemfile
 - lib/templates/Procfile
 - lib/templates/blog/my-first-post.md
+- lib/templates/modules/author.yml
+- lib/templates/modules/navigation.yml
+- lib/templates/modules/projects.yml
+- lib/templates/modules/share-this.yml
+- lib/templates/modules/tag-cloud.yml
 - lib/templates/pages/about.md
-- lib/templates/pages/blog-post.yml
 - lib/templates/pages/default.yml
 - lib/templates/pages/home.yml
+- lib/templates/pages/post.yml
 - lib/templates/pages/posts.yml
 - lib/templates/public/blog/posts/images/my-first-post.png
 - lib/templates/public/blog/posts/images/my-first-post/1-post-image.png
 - lib/templates/public/common/stylesheets/_custom-variables.scss
+- lib/templates/public/favicon.ico
 - lib/templates/public/favicon.png
+- lib/templates/schemaless/author.yml
 - lib/templates/schemaless/footer.yml
 - lib/templates/schemaless/navigation.yml
-- lib/templates/schemaless/social-toolbar.yml
 - lib/templates/single-app-config.ru
 - soupcms-cli.gemspec
 - spec/sopucms-site/dummy_spec.rb

data/lib/templates/schemaless/social-toolbar.yml

@@ -1,7 +0,0 @@
----
-  name: social-toolbar
-
-  twitter: http://www.twitter.com/<%= configs[:name] %>           # update or remove if not needed
-  facebook: http://www.facebook.com/<%= configs[:name] %>         # update or remove if not needed
-  github: https://www.github.com/<%= configs[:name] %>            # update or remove if not needed
-  plus: https://plus.google.com/+<%= configs[:name] %>            # update or remove if not needed