foundation 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb3bc52b1c9dcc4063f50c7b28d8aad6406ea066
-  data.tar.gz: 506484d17cb937e7b1d8aaea0fd3699155d7cdb0
+  metadata.gz: 24f80ba2417fe4e64205b1e8b551c080ebdea5cf
+  data.tar.gz: 5825e9b114c83d4c2c374c0e9b5c5c4036a8cc9f
 SHA512:
-  metadata.gz: ef92abf78e8e6328b0eda237b4bf5736b12092bad898b3913ffc850ce7985a2c684c619cd92cb14deab516394002a495f3bc63d9b121b593465bd926bf0dfbf0
-  data.tar.gz: eecc070821666e97c1ddf23f5d05779ea7b203bf32884c037eee860f7594a201309da2c98958e698e9fbc2ce25ccf1dfa308383baf28c2c6d5451dd1615955c0
+  metadata.gz: 35fe01b9f7564ac3bc5289ce6b6c89177f537e3c6dc2cf9029059312ad8d7c59c4f89547811c69de87b5b324eadcc8c201ce3ef57b25dd112202947e8254b3ad
+  data.tar.gz: 3aa494412fb08343f4b764bb48fccb3efc5501eb866d91fb5c2e3d018c6baafd2f970e50b6a135e356a7566109c9c99f3379c72dabbf1052d5d11a80c889b7aa

data/lib/foundation/cli/generator.rb

@@ -1,4 +1,5 @@
 require "thor"
+require "json"
 
 module Foundation
   module CLI
@@ -16,6 +17,38 @@ module Foundation
           end
           return nil
         end
+
+        def install_dependencies(deps=[])
+          if deps.include?("git") && !which("git")
+            say "Can't find git. You can install it by going here: http://git-scm.com/"
+            exit 1
+          end
+
+          if deps.include?("node") && !which("node")
+            say "Can't find NodeJS. You can install it by going here: http://nodejs.org"
+            exit 1
+          end
+
+          if deps.include?("bower") && !which("bower")
+            say "Can't find bower. You can install it by running: sudo npm install -g bower"
+            exit 1
+          end
+
+          if deps.include?("grunt") && !which("grunt")
+            say "Can't find grunt. You can install it by running: sudo npm install -g grunt-cli"
+            exit 1
+          end
+
+          if deps.include?("compass") && !which("compass")
+            # Auto install Compass as a convenience
+            run("gem install compass", capture: true, verbose: false)
+            run("rbenv rehash", capture: true, verbose: false) if which("rbenv")
+            unless which("compass")
+              say "Can't find compass. You can install it by running: gem install compass"
+              exit 1 
+            end
+          end
+        end
       end
 
       desc "version", "Display CLI version"
@@ -23,53 +56,89 @@ module Foundation
         puts "v#{Foundation::CLI::VERSION}"
       end
 
-      desc "new", "create new project"
-      option :libsass, type: :boolean, default: false
-      option :version, type: :string
-      def new(name)
-        # RUBY_VERSION == "2.0.0"
-        unless which("compass")
-          run("gem install compass", capture: true, verbose: false)
-          run("rbenv rehash", capture: true, verbose: false) if which("rbenv")
+      desc "upgrade", "Upgrade your Foundation 4 compass project"
+      def upgrade
+        install_dependencies(%w{git node bower compass})
+        
+        if File.exists?(".bowerrc")
+          begin json = JSON.parse(File.read(".bowerrc"))
+          rescue JSON::ParserError
+            json = {}
+          end
+          unless json.has_key?("directory")
+            json["directory"] = "bower_components"
+          end
+          File.open(".bowerrc", "w") {|f| f.puts json.to_json}
+        else
+          create_file ".bowerrc" do
+            {:directory=>"bower_components"}.to_json
+          end
         end
+        bower_directory = JSON.parse(File.read(".bowerrc"))["directory"]
 
-        unless which("node") || which("npm")
-          say "Please install NodeJS. (psst, go here: http://nodejs.org) Aborting."
-          exit 1
+        gsub_file "config.rb", /require [\"\']zurb-foundation[\"\']/ do |match|
+          match = "add_import_path \"#{bower_directory}/foundation/scss\""
+        end
 
+        unless File.exists?("bower.json")
+          create_file "bower.json" do
+            {:name => "foundation_project"}.to_json
+          end
         end
 
-        unless which("bower")
-          say "Please install bower. (psst, run: sudo npm install -g bower) Aborting."
-          exit 1
-        end      
+        run "bower install zurb/bower-foundation --save"
 
 
-        if options[:libsass]
-          unless which("grunt")
-            say "Please install grunt-cli. (psst, run: sudo npm install -g grunt-cli) Aborting."
-            exit 1
+        if defined?(Bundler)
+          Bundler.with_clean_env do
+            run("compass compile", capture: true, verbose: false)
           end
+        else
+          run("compass compile", capture: true, verbose: false)
+        end
+
+        say <<-EOS
+
+Foundation 5 has been setup in your project.
+
+Please update references to javascript files to look something like:
+
+<script src="#{bower_directory}/foundation/js/foundation.min.js"></script>
+
+To update Foundation in the future, just run: foundation update
+
+        EOS
+      end
+
+      desc "new", "create new project"
+      option :libsass, type: :boolean, default: false
+      option :version, type: :string
+      def new(name)
+        if options[:libsass]
+          install_dependencies(%w{git node bower grunt})
           repo = "https://github.com/zurb/foundation-libsass-template.git"
         else
-          unless which("compass")
-            run("gem install compass", capture: true, verbose: false)
-            run("rbenv rehash", capture: true, verbose: false) if which("rbenv")
-          end
+          install_dependencies(%w{git node bower compass})
           repo = "https://github.com/zurb/foundation-compass-template.git"
         end
 
         say "Creating ./#{name}"
         empty_directory(name)
-        run "git clone #{repo} #{name}", capture: true, verbose: false
+        run("git clone #{repo} #{name}", capture: true, verbose: false)
         inside(name) do
           say "Installing dependencies with bower..."
-          run "bower install", capture: true, verbose: false
+          run("bower install", capture: true, verbose: false)
           create_file "scss/_settings.scss", File.read("#{destination_root}/bower_components/foundation/scss/foundation/_settings.scss")
-          run "git remote rm origin", capture: true, verbose: false
+          run("git remote rm origin", capture: true, verbose: false)
           if options[:libsass]
             run "npm install"
             run "grunt build"
+          else
+            if defined?(Bundler)
+              Bundler.with_clean_env do
+                run "compass compile"
+              end
+            end
           end
         end
 

data/lib/foundation/cli/version.rb

@@ -1,5 +1,5 @@
 module Foundation
   module CLI
-    VERSION = "1.0.2"
+    VERSION = "1.0.3"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foundation
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Mark Hayes
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-23 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler