weebly 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b31a6387f0d261530362c8b8f561572ebda71855
-  data.tar.gz: 8781f0e20a1140d677145238e69622f064d3abeb
+  metadata.gz: 8c0723afddd48aeb59a9b592cd0707bdaa8da824
+  data.tar.gz: 3408740a8a08563daa6d30b83c8a423fbaffb885
 SHA512:
-  metadata.gz: 57555eef136c2c9b1746dfd368acd9b1cedb8b9701640325cdf121715095b63d2b492d0b9ef0ef3a6db2b36c070dd96b4cfc2888d66508a09b06c165cc9789bf
-  data.tar.gz: 1413bec542ac8ff999a742955435b395ed03d64a6e824a8592327407cbe09fbe75b537b2b7e97d58404b997a8ef73d49e23774826900314f557a038ed060b79f
+  metadata.gz: 945951e63baf4cff110bca84395f4f5fa76d909c5479f2ea7b41039afd2eb155e68f370c4a480c6d3540be98cf39290512f640ce93b642b5ac2d47f1fede1667
+  data.tar.gz: 34ae006d9ab9fc9925ee342caf9ae21ce9fa1be4cb8d2829755a32e6edfafda6964e52bc942f89903dc2c911b54a7cf96a06c35d9cd79128355fe7aabde74161

data/LICENSE

@@ -0,0 +1,201 @@
+Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

data/README.md

@@ -1,4 +1,4 @@
-# Weebly
+# Weebly [![Gem Version](https://badge.fury.io/rb/weebly.svg)](http://badge.fury.io/rb/weebly) [![Dependency Status](https://gemnasium.com/joshbeitler/weebly.svg)](https://gemnasium.com/joshbeitler/weebly)
 
 Sometimes, Weebly is a nice option to use for client websites when you simply
 want to get something done quickly, or for situations in which you want to
@@ -32,21 +32,21 @@ in a browser.
 
 ## Commands
 
-### `weebly new <sitename>`
+#### `weebly new <sitename>`
 Will create a new site in the current directory with the name `sitename`.
 This site will include a basic directory structure, with places for CSS, JS,
 HTML layouts, and images.
 
-### `weebly build`
+#### `weebly build <build_options>`
 When run from a directory containing a site (eg: `sites/hello`, where `hello`
 is the Weebly site`), this command will validate, clean up, and compress your
-site to be Weebly-ready.
+site to be Weebly-ready.  Supplying the `-n` flag will skip any validation checks that the gem might perform prior to a build.
 
-### `weebly validate`
+#### `weebly validate`
 Will validate your site to ensure that it conforms to Weebly's standards.  
 (Searches for template tags, directory structure, etc.)
 
-### `weebly server`
+#### `weebly server`
 Will run your site on a local webserver (defaults to `localhost:8000`) and
 emulate the Weebly environment.  Note: *simply opening `index.html` in your
 web browser is not good practice, and will not even work in this case.
@@ -58,3 +58,20 @@ web browser is not good practice, and will not even work in this case.
 3. Commit your changes (`git commit -am 'Add some feature'`)
 4. Push to the branch (`git push origin my-new-feature`)
 5. Create new Pull Request
+
+## License
+```
+Copyright 2014 Joshua Beitler
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+```

data/bin/weebly

@@ -24,8 +24,10 @@ command :build do |c|
   c.syntax      = 'weebly build'
   c.description = 'Compiles site structure and zips'
 
+  c.option '-n', nil, 'Skips site correctness checks'
+
   c.action do |args, options|
-    Weebly::Weebly.build_site
+    Weebly::Weebly.build_site(options)
   end
 end
 

data/lib/weebly.rb

@@ -2,14 +2,13 @@ require 'weebly/version'
 require 'zip'
 require 'webrick'
 require 'colorize'
-require 'listen'
 
 module Weebly
   class Weebly
     def self.create_site(dirname, opts)
       if dirname == nil || dirname.length < 1
         puts '=> Error: No name provided'.colorize(:red)
-        return
+        exit
       end
 
       begin
@@ -23,22 +22,26 @@ module Weebly
         "#{dirname}/css/main_style.css", 
         "#{dirname}/js/#{dirname}.js",
         "#{dirname}/index.html",
+        "#{dirname}/splash.html",
+        "#{dirname}/no-header.html",
+        "#{dirname}/landing.html",
         "#{dirname}/.gitignore",
         "#{dirname}/README.md",
         "#{dirname}/AUTHORS.md"])
-
-      system("cd #{dirname} && git init")
+      system("cd #{dirname} && git init > /dev/null 2>&1")
 
       puts "=> Created site `#{dirname}` successfully".colorize(:green)
     end
 
-    def self.build_site
+    def self.build_site(buildopts)
       puts "=> Building site..."
 
-      if self.validate_site
-        puts "==> Site conforms".colorize(:green)
-      else
-        exit
+      if ! buildopts.n
+        if self.validate_site == true
+          puts "==> Site conforms".colorize(:green)
+        else
+          exit
+        end
       end
 
       if ! File.exist?("index.html")
@@ -47,9 +50,8 @@ module Weebly
       end
 
       dirname = File.split(Dir.getwd)[-1]
-      FileUtils.rmdir("/tmp/#{dirname}") if File.directory?("/tmp/#{dirname}")
-      FileUtils.rmdir("#bin") if File.directory?("#bin")
-      FileUtils.rm("#{dirname}.zip") if File.exist?("#{dirname}.zip")
+      FileUtils.rm_rf("/tmp/#{dirname}") if File.directory?("/tmp/#{dirname}")
+      FileUtils.rm_rf("bin") if File.directory?("bin")
       FileUtils.mkdir_p ["/tmp/#{dirname}", "bin"]
       
       FileUtils.cp(Dir["js/**/*"], "/tmp/#{dirname}/")
@@ -71,40 +73,58 @@ module Weebly
     def self.validate_site
       if ! File.exist?("index.html")
         puts "=> Error: Not a Weebly site".colorize(:red)
-        return
+        return false
       end
 
+      errors  = []
+      success = true
+
       Dir.new('.').each do |f|
-        if File.directory?(f) || File.extname(f) != '.html'
-          next
+        next if File.directory?(f) || File.extname(f) != '.html'
+
+        if ! self.validate_tag(/{content}/, f)
+          errors << "==> Error: `#{File.basename(f)}` does not have a content tag"
+            .colorize(:red)
+        end
+
+        if ! self.validate_tag(/{footer}/, f)
+          errors << "==> Error: `#{File.basename(f)}` does not have a footer tag"
+            .colorize(:red)
         end
-       
-        ret = true
-
-        if ! File.readlines(f).grep(/{content}/).any?
-          puts "==> Error: `#{File.basename(f)}` does not have a content tag".colorize(:red)
-          ret = false
-        elsif ! File.readlines(f).grep(/{footer}/).any?
-          puts "==> Error: `#{File.basename(f)}` does not have a footer tag".colorize(:red)
-          ret = false
-        elsif ! File.readlines(f).grep(/{menu}/).any?
-          puts "==> Warning: `#{File.basename(f)}` does not have a menu tag".colorize(:red)
-          ret = false
+
+        if ! self.validate_tag(/{title}/, f)
+          errors << "==> Error: `#{File.basename(f)}` does not have a title tag"
+            .colorize(:red)
+        end
+
+        if ! self.validate_tag(/{menu}/, f)
+          errors << "==> Error: `#{File.basename(f)}` does not have a menu tag"
+            .colorize(:red)
         end
       end
+
+      puts errors if errors.length > 0
+      return success
     end
 
     def self.serve_site
       if ! File.exist?("index.html")
         puts "=> Error: Not a Weebly site".colorize(:red)
-        return
+        exit
       end
 
+      self.build
+
       spath   = "/tmp/#{File.split(Dir.getwd)[-1]}/"
       server  = WEBrick::HTTPServer.new(:Port => 8000, :DocumentRoot => spath)
       
       trap 'INT' do server.shutdown end
       server.start
     end
+
+    def self.validate_tag(tag, file)
+      return false if ! File.readlines(file).grep(tag).any?
+      return true
+    end
   end
 end

data/lib/weebly/version.rb

@@ -1,3 +1,3 @@
 module Weebly
-  VERSION = "1.0.0"
+  VERSION = "1.1.0"
 end

data/weebly.gemspec

@@ -24,5 +24,4 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "commander"
   spec.add_runtime_dependency "rubyzip"
   spec.add_runtime_dependency "colorize"
-  spec.add_runtime_dependency "listen", "~> 2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: weebly
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Joshua Beitler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-15 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,20 +80,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: listen
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.0'
 description: Makes weebly development easier
 email:
 - joshbeitler@gmail.com
@@ -104,7 +90,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - Gemfile
-- LICENSE.txt
+- LICENSE
 - README.md
 - Rakefile
 - bin/weebly

data/LICENSE.txt

@@ -1,22 +0,0 @@
-Copyright (c) 2014 Joshua Beitler
-
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.