rusic 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e67035adba925d6a05bf05337ff09e64dda3293f
-  data.tar.gz: 55fb06922d39f4cf2bbd02aaff7af47bca7696a6
+  metadata.gz: f70c8fd8612e0b964d55854a9efebe37ce213e41
+  data.tar.gz: cc3f8714e70a366827541dcb13d32bc5af0d8888
 SHA512:
-  metadata.gz: d72164b58b68aeb4f42938d70436afd7962ca0c35e8cdc8eb6f407ff05b2bb701452072e516f45a5f249f1c565664d8dba1e25267fd932a7c82716f8473a6c8f
-  data.tar.gz: a2efe8851ac942c3868371a0309259966c423ba7e0b069db465245cc6a107b408039208b3938003ea4f54b875055a894baffca4a3410160de8270fde28117982
+  metadata.gz: 07f93568fcde7178abd42d052aea34c4869de0a347a9e8a96d80904217d90dc183b49d8e9b01c4721e733b29e4fdc8e8f4ad7714d8bc1780c5316989acc2d88f
+  data.tar.gz: f98a7df8e9a09018d83cdf485d54422f38aa5779d1c2485f8aec1bf69682014aafcfc144878c5111588cb78f9f8f194ff2a05792941c70593cbe373687e82735

data/README.md

@@ -24,10 +24,11 @@ choice) and see the changes live on Rusic immediately.
 ```
 $ rusic
 Tasks:
-  rusic help [TASK]  # Describe available tasks or one specific task
-  rusic new NAME     # Create a new Rusic theme
-  rusic deploy       # Upload theme to Rusic
-  rusic version      # Display version of Rusic gem
+  rusic help [TASK]   # Describe available tasks or one specific task
+  rusic new NAME      # Create a new Rusic theme
+  rusic deploy [ENV]  # Upload theme to Rusic
+  rusic settings      # Display settings from a .rusic file
+  rusic version       # Display version of Rusic gem
 ```
 
 ### Generate new theme
@@ -72,7 +73,7 @@ This will create a simple, bootstrapped theme
 ```shell
 $ rusic help deploy
 Usage:
-  rusic deploy
+  rusic deploy [ENV]
 
 Options:
   [--api-key=API_KEY]
@@ -113,6 +114,35 @@ $ touch layouts/subdomain.html.liquid # in another process
 Saved layouts/subdomain.html.liquid
 ```
 
+### Deploy using a `.rusic` file
+
+You can add a `rusic.yml` file to your project directory and set your environments
+settings within this file. This file should be valid
+[YAML](http://www.yaml.org/start.html) and looks like this -
+
+```yaml
+#
+api_key: xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+stage:
+  theme: 2
+production:
+  api_key: yyyyyyyyyyyyyyyyyyyyyyyyyyyyyyyy
+  theme: 1
+```
+
+To deploy to production you need to run
+
+```shell
+$ rusic deploy production
+```
+
+This also works with `--watch`
+
+
+```shell
+$ rusic deploy production --watch
+```
+
 MIT Licenced
 
 Copyright © 2011–2014, Simpleweb Ltd.

data/lib/rusic/cli.rb

@@ -1,6 +1,7 @@
 require 'thor'
 require 'pathname'
 require 'filewatcher'
+require 'yaml'
 
 module Rusic
   class CLI < Thor
@@ -9,30 +10,30 @@ module Rusic
       Rusic::Generators::Theme.start([name])
     end
 
-    desc "deploy", "Upload theme to Rusic"
+    desc "deploy [ENV]", "Upload theme to Rusic"
     method_option :api_key, type: :string
     method_option :api_host, type: :string, default: 'api.rusic.com'
     method_option :theme, type: :string
     method_option :watch, type: :boolean
-    def deploy
-      path = Pathname.new('.')
+
+    def deploy(env = nil)
+      path = Pathname.new(Dir.pwd)
       files = []
 
       files << Dir.glob(path.join('{layouts,ideas,pages}', '*.liquid'))
       files << Dir.glob(path.join('assets', '*.*'))
 
       files.flatten!
-
-      if options[:watch]
+      if options['watch']
         FileWatcher.new(%w[layouts/ ideas/ pages/ assets/]).watch(0.5) do |file, event|
           unless event == :delete
             deployer = Rusic::Deployer.new(file)
-            deployer.upload_files(options)
+            deployer.upload_files(deploy_options_for(env))
           end
         end
       else
         deployer = Rusic::Deployer.new(files)
-        deployer.upload_files(options)
+        deployer.upload_files(deploy_options_for(env))
       end
     end
 
@@ -40,5 +41,18 @@ module Rusic
     def version
       puts Rusic::VERSION
     end
+
+    private
+
+    def deploy_options_for(env)
+      environment_options = options_from_file
+      environment_options.merge!(options_from_file.fetch(env, {}))
+      Thor::CoreExt::HashWithIndifferentAccess.new(environment_options.merge(options))
+    end
+
+    def options_from_file
+      config_file = Dir.glob(File.join(Dir.pwd, '.rusic{,.yml,.yaml}')).first
+      ::YAML::load_file(config_file) || {}
+    end
   end
 end

data/lib/rusic/generators/theme.rb

@@ -16,6 +16,10 @@ module Rusic
         empty_directory(name)
       end
 
+      def git
+        copy_file('templates/gitignore', "#{name}/.gitignore")
+      end
+
       def readme
         template('templates/README.md', "#{name}/README.md", name: name)
       end

data/lib/rusic/templates/gitignore

@@ -0,0 +1 @@
+.rusic*

data/lib/rusic/version.rb

@@ -1,3 +1,3 @@
 module Rusic
-  VERSION = "1.2.0"
+  VERSION = "1.3.0"
 end

data/rusic.gemspec

@@ -6,9 +6,9 @@ require 'rusic/version'
 Gem::Specification.new do |spec|
   spec.name          = "rusic"
   spec.version       = Rusic::VERSION
-  spec.authors       = ['Chris Mytton', 'Paul Springett']
-  spec.email         = ['self@hecticjeff.net', 'paul@simpleweb.co.uk']
-  spec.description   = 'Theme creation and deployment'
+  spec.authors       = ['Chris Mytton', 'Paul Springett', 'Adam Butler', 'Peter Rhoades']
+  spec.email         = ['self@hecticjeff.net', 'paul@simpleweb.co.uk', 'adam@lab.io', 'createdbypete@gmail.com']
+  spec.description   = 'Theme creation and deployment for the Rusic platform'
   spec.summary       = 'Generate and deploy themes to Rusic'
   spec.homepage      = 'http://developer.rusic.com/'
   spec.license       = "MIT"
@@ -18,12 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'thor', '~> 0.14.6'
+  spec.add_runtime_dependency 'thor', '~> 0.14'
   spec.add_runtime_dependency 'rest-client', '~> 1.6'
   spec.add_runtime_dependency 'filewatcher', '~> 0.3'
   spec.add_runtime_dependency 'command_line_reporter', '~> 3.3'
 
-  spec.add_development_dependency 'rake', '~> 0.9.0'
-  spec.add_development_dependency 'rspec', '~> 2.6.0'
-  spec.add_development_dependency 'rack-test', '~> 0.6'
+  spec.add_development_dependency 'rake'
 end

metadata

@@ -1,15 +1,17 @@
 --- !ruby/object:Gem::Specification
 name: rusic
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Chris Mytton
 - Paul Springett
+- Adam Butler
+- Peter Rhoades
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-14 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -17,14 +19,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: '0.14'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.14.6
+        version: '0.14'
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -71,55 +73,28 @@ dependencies:
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 0.9.0
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 2.6.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 2.6.0
-- !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.6'
-description: Theme creation and deployment
+        version: '0'
+description: Theme creation and deployment for the Rusic platform
 email:
 - self@hecticjeff.net
 - paul@simpleweb.co.uk
+- adam@lab.io
+- createdbypete@gmail.com
 executables:
 - rusic
 extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
-- ".ruby-version"
 - Gemfile
 - MIT-LICENCE
 - README.md
@@ -137,6 +112,7 @@ files:
 - lib/rusic/templates/assets/glyphicons-halflings-regular.svg
 - lib/rusic/templates/assets/glyphicons-halflings-regular.ttf
 - lib/rusic/templates/assets/glyphicons-halflings-regular.woff
+- lib/rusic/templates/gitignore
 - lib/rusic/templates/ideas/edit.html.liquid
 - lib/rusic/templates/ideas/index.html.liquid
 - lib/rusic/templates/ideas/new.html.liquid

data/.ruby-version

@@ -1 +0,0 @@
-2.1.1