octocatalog-diff 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a6057ffec45d60dbe793f5b81170c1d00b7d1af
-  data.tar.gz: 158d57d91c2d57d3f796732b814f85394346f553
+  metadata.gz: bd8f7061eaf89165ab41fe52f67b2a6a16a355e9
+  data.tar.gz: 82ced3eb61baa30e35c979fbe748f00ed13c015f
 SHA512:
-  metadata.gz: 2ea4c161583582db60e6e89349ff4c2e2153080fc27a01b2b7a5f01af3ef920d52b69a1515c7f4c51329036c7949aea5ad7d97221e6a987a765240f4b5cc05e8
-  data.tar.gz: fbccb8d52fe1346f880584d95405b744e119528686846c7dfcd36d0e7087273c27c5703d90ad5a985b7fd1e6ef558e9b2b34c677d4508f52ecb791314166cb1b
+  metadata.gz: 3d93c41ab87ba8a41dd701d53efa2074eab6f3bfd3b7327db2150db0d0c42eb7179ed336d4300d16956010b73dc1446acea0b9d0bc516b32e2025b6631718e5b
+  data.tar.gz: c951dc4cdf13de9ff9204e845bcf87f9f07d13a0cb50eb9844c30322846c90685fca4a3a16bc805bab1932bb40f86f33ddd0b31505c1606144e623424b1a7f0d

data/.version

@@ -1 +1 @@
-1.0.2
+1.0.3

data/doc/CHANGELOG.md

@@ -8,6 +8,13 @@
 </tr>
 </thead><tbody>
 <tr valign=top>
+<td>1.0.3</td>
+<td>2017-03-15</td>
+<td>
+<li><a href="https://github.com/github/octocatalog-diff/pull/86">#86</a>: Ability to use `--environment` without `--preserve-environments`</li>
+</td>
+</tr>
+<tr valign=top>
 <td>1.0.2</td>
 <td>2017-03-08</td>
 <td>

data/lib/octocatalog-diff/catalog-util/builddir.rb

@@ -84,11 +84,14 @@ module OctocatalogDiff
             install_directory_symlink(logger, File.join(@options[:basedir], x), x)
           end
         else
-          if @options[:environment]
-            logger.warn '--environment is ignored unless --preserve-environments is used' unless logger.nil?
-          end
-          if @options[:create_symlinks]
+          if @options[:create_symlinks] && @options[:environment]
+            unless logger.nil?
+              logger.warn '--create-symlinks with --environment ignored unless --preserve-environments is used'
+            end
+          elsif @options[:create_symlinks]
             logger.warn '--create-symlinks is ignored unless --preserve-environments is used' unless logger.nil?
+          elsif @options[:environment]
+            return install_directory_symlink(logger, @options[:basedir], "environments/#{@options[:environment]}")
           end
           install_directory_symlink(logger, @options[:basedir])
         end
@@ -178,6 +181,7 @@ module OctocatalogDiff
       def install_directory_symlink(logger, dir, target = 'environments/production')
         raise ArgumentError, "Called install_directory_symlink with #{dir.class} argument" unless dir.is_a?(String)
         raise Errno::ENOENT, "Specified directory #{dir} doesn't exist" unless File.directory?(dir)
+
         symlink_target = File.join(@tempdir, target)
 
         if target =~ %r{/}
@@ -330,7 +334,7 @@ module OctocatalogDiff
       end
 
       def environment
-        @options[:preserve_environments] ? @options.fetch(:environment, 'production') : 'production'
+        @options.fetch(:environment, 'production')
       end
     end
   end

data/lib/octocatalog-diff/catalog-util/command.rb

@@ -78,7 +78,7 @@ module OctocatalogDiff
         # Add environment - only make this variable if preserve_environments is used.
         # If preserve_environments is not used, the hard-coded 'production' here matches
         # up with the symlink created under the temporary directory structure.
-        environ = @options[:preserve_environments] ? @options.fetch(:environment, 'production') : 'production'
+        environ = @options.fetch(:environment, 'production')
         cmdline << "--environment=#{Shellwords.escape(environ)}"
 
         # For people who aren't running hiera, a hiera-config will not be generated when @options[:hiera_config]

data/lib/octocatalog-diff/catalog/computed.rb

@@ -80,7 +80,7 @@ module OctocatalogDiff
 
       # Environment used to compile catalog
       def environment
-        @opts[:preserve_environments] ? @opts.fetch(:environment, 'production') : 'production'
+        @opts.fetch(:environment, 'production')
       end
 
       private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: octocatalog-diff
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - GitHub, Inc.
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-08 00:00:00.000000000 Z
+date: 2017-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy