app_stack 1.6.0 → 1.6.2

data/Gemfile

@@ -3,7 +3,7 @@ source 'http://ruby.taobao.org'
 gem 'diffy'
 gem 'tilt'
 gem 'term-ansicolor'
-gem 'activesupport'
+gem 'hash-deep-merge'
 
 group :development, :test do
   gem 'rspec'

data/Gemfile.lock

@@ -1,55 +1,46 @@
 GEM
   remote: http://ruby.taobao.org/
   specs:
-    activesupport (4.0.0)
-      i18n (~> 0.6, >= 0.6.4)
-      minitest (~> 4.2)
-      multi_json (~> 1.3)
-      thread_safe (~> 0.1)
-      tzinfo (~> 0.3.37)
     ast (1.1.0)
-    atomic (1.1.13)
-    diff-lcs (1.2.4)
+    diff-lcs (1.2.5)
     diffy (3.0.1)
-    i18n (0.6.5)
-    minitest (4.7.5)
-    multi_json (1.8.0)
-    parser (2.0.0)
+    docile (1.1.1)
+    hash-deep-merge (0.1.1)
+    multi_json (1.8.2)
+    parser (2.1.1)
       ast (~> 1.1)
       slop (~> 3.4, >= 3.4.5)
     powerpack (0.0.9)
-    rainbow (1.1.4)
+    rainbow (1.99.1)
     rspec (2.14.1)
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.5)
-    rspec-expectations (2.14.3)
+    rspec-core (2.14.7)
+    rspec-expectations (2.14.4)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.3)
-    rubocop (0.14.1)
-      parser (~> 2.0)
+    rspec-mocks (2.14.4)
+    rubocop (0.16.0)
+      parser (~> 2.1)
       powerpack (~> 0.0.6)
       rainbow (>= 1.1.4)
-    simplecov (0.7.1)
-      multi_json (~> 1.0)
-      simplecov-html (~> 0.7.1)
-    simplecov-html (0.7.1)
-    slop (3.4.6)
+    simplecov (0.8.2)
+      docile (~> 1.1.0)
+      multi_json
+      simplecov-html (~> 0.8.0)
+    simplecov-html (0.8.0)
+    slop (3.4.7)
     term-ansicolor (1.2.2)
       tins (~> 0.8)
-    thread_safe (0.1.2)
-      atomic
-    tilt (1.4.1)
-    tins (0.11.0)
-    tzinfo (0.3.37)
+    tilt (2.0.0)
+    tins (0.13.1)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activesupport
   diffy
+  hash-deep-merge
   rspec
   rubocop
   simplecov

data/app_stack.gemspec

@@ -14,7 +14,8 @@ Gem::Specification.new 'app_stack', AppStack::VERSION do |s|
 
   s.add_dependency 'tilt'
   s.add_dependency 'term-ansicolor'
-  s.add_dependency 'activesupport'
+  # s.add_dependency 'activesupport'
+  s.add_dependency 'hash-deep-merge'
   s.add_dependency 'diffy'
   s.add_development_dependency 'rspec'
   s.add_development_dependency 'rubocop'

data/lib/app_stack.rb

@@ -6,7 +6,7 @@ class String; include Term::ANSIColor end
 
 require 'yaml'
 require 'pp'
-require 'active_support/core_ext/hash/deep_merge'
+require 'hash_deep_merge'
 require 'tempfile'
 require 'diffy'
 require 'tilt'

data/lib/app_stack/app.rb

@@ -34,13 +34,13 @@ module AppStack
         @app_stacks[app] = App.new(AppStack.find_conf_file(app_dir), app_dir)
         @app_stacks[app].rel_path = File.join(directory, config.stack_dir, app)
         @app_stacks[app].parse_export_groups!
-        @attrs.deep_merge! @app_stacks[app].config.attrs
+        @attrs = @attrs.deep_merge @app_stacks[app].config.attrs
 
         # info "load app #{app.bold} as", @app_stacks[app]
         info "load app #{app.bold}"
       end
 
-      @attrs.deep_merge! config.attrs
+      @attrs = @attrs.deep_merge config.attrs
       info 'merged attrs', attrs
       @app_stacks
     end

data/lib/app_stack/compare_list.rb

@@ -66,13 +66,13 @@ module AppStack
     def label
       str = "#{operation} #{from_file_short_name.blue} from " +
             "#{from_app.app_name.bold}"
-      str << "as #{to_file_short_name.blue}" unless
+      str << " as #{to_file_short_name.blue}" unless
         to_file_short_name == from_file_short_name
       str
     end
 
     def reverse_label
-      "Copy back #{from_file_short_name.blue} to #{to_app.app_name.bold}"
+      "copy back #{from_file_short_name.blue} to #{to_app.app_name.bold}"
     end
 
     def skip(msg)

data/lib/app_stack/operator.rb

@@ -44,6 +44,7 @@ module AppStack
         @rev_list[i + 1] = f
       end
 
+      return unless @rev_list.keys.size > 0
       puts "Which file you want to copy reversely?"
       print "(1 2 ...):"
       lists = gets.chomp.split(/\s+/)

data/lib/app_stack/version.rb

@@ -2,5 +2,5 @@
 
 # AppStack module
 module AppStack
-  VERSION = '1.6.0'
+  VERSION = '1.6.2'
 end

metadata

@@ -1,18 +1,20 @@
 --- !ruby/object:Gem::Specification
 name: app_stack
 version: !ruby/object:Gem::Version
-  version: 1.6.0
+  version: 1.6.2
+  prerelease: 
 platform: ruby
 authors:
 - Huang Wei
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: tilt
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -20,6 +22,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -27,6 +30,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -34,13 +38,15 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: activesupport
+  name: hash-deep-merge
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -157,26 +172,27 @@ files:
 homepage: https://github.com/7lime/app_stack-gem
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 1.8.23
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Use as a rake task, define a stack of modules and app-stack will merge files
   from those stack-apps to the local application directory.
 test_files:

checksums.yaml

@@ -1,15 +0,0 @@
----
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    ZTk2N2NhYjI5MjYyNzhiOWY0NDA2NzY4NWRmNWY1M2IxMjk3NGQyMA==
-  data.tar.gz: !binary |-
-    NDcxNzJmMTI2M2E1ZDU5ZmNmOTZhYjVhY2U0NmM3Y2Y4MTEyYWUyMg==
-!binary "U0hBNTEy":
-  metadata.gz: !binary |-
-    YmE3NjFkM2U4YmRkMjU0NjM2NDhhMjQ2NzJhYTVlMjcxMjJjOTE5YTA4Njll
-    ODY5Zjg3ZjE1NmJmMzc3YTBjMDFiOGE0MjVkNjJkYWE5NjY3MzlmZTU0MjUz
-    MWJlODBjMjA5NWM2ZGViZTg2OWNkNmU0Mjg3YzMyMDdmNzE1NWI=
-  data.tar.gz: !binary |-
-    OTFjNGNiYzkyMjA4ZjFkOGNkMjg5YmMyNWZiNGI0YWQ5MjNhYzcyNTc2OGUy
-    YzkxY2M3MGQxMTdiYmFlNzgxYTQ3NzBmNTFmNDNhY2E1YzNmYjEyZjAzMGMy
-    ZDA5ZGUyZGY5NjJiOGYxMDlmMmIwYjgxNDJlODVhMzFhY2E1NTQ=