lib/zine/cli.rb in zine-0.16.0 vs lib/zine/cli.rb in zine-0.17.0

@@ -10,90 +10,90 @@
 
 module Zine
   # CLI for zine
   class CLI < Thor
     include Thor::Actions
-    attr_accessor :the_site # only used in testing
+    attr_accessor :site # only used in testing
 
     no_commands do
       def self.exit_on_failure?
         true
       end
 
-      def init_site
-        @the_site ||= Zine::Site.new
+      def site
+        @site ||= Zine::Site.new
       end
 
       def options
-        init_site
+        site
 
-        # for v0.16.0 only
-        unless @the_site.options['templates']['atom']
+        # for v0.16.0 & a few more only
+        unless @site.options['templates'] && @site.options['templates']['atom']
           puts "v0.16.0 changes how rss & atom works, see CHANGELOG.md if you haven't already\n\n"
         end
 
-        @the_site.options
+        @site.options
       end
     end
 
     desc 'build', 'Build the site'
     def build
       # set_trace_func proc { |event, file, line, id, _binding, classname|
       #  if event == 'call' && classname.name.split('::').first == 'Zine'
       #    printf "%25s\#%s\t\t\t%s:%-2d\n", classname, id, file, line
       #  end
       # }
-      init_site
-      @the_site.build_site
+      site
+      @site.build_site
       puts Rainbow('Site built').green
     end
 
     desc 'force', 'Build the site, forcing writes & uploads'
     def force
-      init_site
-      @the_site.build_site_forcing_writes
+      site
+      @site.build_site_forcing_writes
       puts Rainbow('Site built').green
     end
 
     desc 'notice POST', 'Build the site, then force the one POST'
     def notice(file)
-      init_site
-      @the_site.notice(file)
+      site
+      @site.notice(file)
       puts Rainbow('Site built').green
     end
 
     desc 'nuke', 'Delete the build folder'
     def nuke
-      init_site
+      site
       FileUtils.remove_dir options['directories']['build'],
                            force: true
       puts Rainbow('Site nuked. It\'s the only way to be sure.').green
     end
 
     desc 'post TITLE', 'Create the file for a new blog post, titled TITLE'
     def post(name)
-      init_site
+      site
       option_dir = options['directories']
       Zine::CLI.source_root option_dir['templates']
       @date = DateTime.now
       @name = name
       file = "#{@date.strftime('%Y-%m-%d')}-#{Zine::Page.slug(name)}.md"
       new_post_name = options['templates']['new_post']
       template new_post_name,
                File.join(Dir.pwd, option_dir['posts'], file)
     end
 
-    desc 'site', 'Create the skeleton of a new site (overwriting files)'
-    def site
+    desc 'skeleton', 'Create the skeleton of a new site (overwriting files)'
+    def skeleton
       # @skeleton_dir ?
       skeleton_dir = File.join File.dirname(__FILE__), 'skeleton', '/.'
       FileUtils.cp_r skeleton_dir, Dir.pwd
       puts Rainbow('New skeleton site created').green
     end
 
     desc 'style', 'Build the site\'s stylesheet'
     def style
-      init_site
+      site
       style = Zine::Style.new(options['directories'])
       style.process(File)
       puts Rainbow('Stylesheet rendered').green
     end