slideoff 0.3 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a50c9f4b9fb5933f3b718b4cb7caf0d7f01fdca9
-  data.tar.gz: c0e85071f700e4a6bf231965401ce202de73751d
+  metadata.gz: 3342ad11624886342653e6bc66b89512342efc05
+  data.tar.gz: a4b960dedad2fcc6bc6987006a9f72ddce574e3a
 SHA512:
-  metadata.gz: 41639965b9d4ea7e04852eefc93a64c84abba6175e77866d66c68397b559e6b627e438849dbe7ca1285263011aba24209c28f4eebabdbf73bf13addb32f4b9f4
-  data.tar.gz: cda24d0ee6c9ce12cfa6a9fad72a3ed8aa7d725003b1ab496d0d938b615c69de62a6660c09e2b820693d49679aa5c38f248f7b57a985a6c8bff1c0de4ea641a6
+  metadata.gz: 539638da63732104be967752c179521a08dffcf6c59b2743e97edf3814872ac2f4499ed0c9b75ec68216d7fff19958453d78ff6e8c76a6be14d5167341d9e193
+  data.tar.gz: 5de90cea3eddc9ab5c7ad7240664c615819de1199bbd64610a3bcfdb172befe5d1df33db2ad96f3a4882e57adc6b0dbcda48e633dcb22eeb33cfcf641cdd73dd

data/README.md

@@ -54,7 +54,8 @@ element.
 Override some theme styles by using `style.css` in the presentation directory. Another way is to clone the theme via
 `slideoff install_theme <git-url>` and make changes there. Be sure to use the correct theme name in `presentation.json`.
 
-Asset lookup in this order:
+Assets are looked up in this order:
+
 1. `./<asset_name>`
 1. `.config/slideoff/themes/<theme_name>/<asset_name>`
 1. `installation_dir/themes/<theme_name>/<asset_name>`
@@ -209,11 +210,6 @@ Try it in your example presentation after initialization.
 Found an issue or have a suggestion? Please report it on
 [Github's issue tracker](http://github.com/DSIW/slideoff/issues).
 
-If you wants to make a pull request, please check the specs before:
-
-    bundle exec spec/slideoff_spec.rb
-
-
 ## Credits
 
 Bruno Michel is the guy who made [Slide'em up](https://github.com/nono/slide-em-up) and Scott Chacon is the guy who made

data/bin/slideoff

@@ -96,13 +96,7 @@ command [:serve_static] do |c|
   c.flag [:p,:port]
 
   c.action do |global_options,options,args|
-    if File.basename(Dir.pwd) =~ /^static/
-      Slideoff::Utils.serve_static(options[:port], verbose: true)
-    else
-      Dir.chdir(Slideoff::Utils.static_dir) do |dir|
-        Slideoff::Utils.serve_static(options[:port], verbose: true)
-      end
-    end
+    Slideoff::Utils.serve_static(options[:port], verbose: true)
   end
 end
 

data/lib/slideoff.rb

@@ -11,5 +11,5 @@ module Slideoff
   autoload :FlickrAPI,       "slideoff/flickr_api"
 
   CONFIG = ConfigBuilder.new(Dir.pwd)
-  VERSION = "0.3"
+  VERSION = "0.3.1"
 end

data/lib/slideoff/config_builder.rb

@@ -11,7 +11,8 @@ module Slideoff
       "theme" => "shower",
       "duration" => 60,
       "author" => "Max Mustermann",
-      "pygments_style" => "colorful"
+      "pygments_style" => "colorful",
+      "static_dir" => "static"
     }
     SECTION_DEFAULT = {
       "show_chapter" => true,
@@ -27,8 +28,8 @@ module Slideoff
           new_hash.merge!(k => SECTION_DEFAULT.merge(hash))
         end
         Dir.chdir(_dir) do
-          infos['css'] = Dir["**/*.css"]
-          infos['js']  = Dir["**/*.js"]
+          infos['css'] = Dir["**/*.css"].sort - Dir["#{DEFAULT["static_dir"]}/**/*.css"]
+          infos['js']  = Dir["**/*.js"].sort - Dir["#{DEFAULT["static_dir"]}/**/*.js"]
         end
         ENV["FLICKR_API_KEY"] = infos['flickr_api_key']
       end

data/lib/slideoff/presentation.rb

@@ -64,8 +64,8 @@ module Slideoff
         end
         t.title = title
         Dir.chdir(t.dir) do
-          t.css = Dir["**/*.css"]
-          t.js  = Dir["**/*.js"]
+          t.css = Dir["**/*.css"].sort
+          t.js  = Dir["**/*.js"].sort
         end
       end
     end

data/lib/slideoff/utils.rb

@@ -415,14 +415,14 @@ PageDown / Down / right / l / j | Goto next slide
       path = CONFIG.remote_path
       mkdir_commands = parents(path).map { |path| "mkdir -vp -m 755 #{path}" }
       remote_cmd mkdir_commands
-      `scp -r #{File.join(static_dir, "*")} #{CONFIG.remote_host}:#{path}`
+      `scp -r #{File.join(CONFIG.static_dir, "*")} #{CONFIG.remote_host}:#{path}`
       remote_cmd "chmod -vR o+r #{path}"
     end
 
     def generate_static(options = {})
       fork_server(options) do
-        FileUtils.mkdir_p(static_dir)
-        Dir.chdir(static_dir) do |dir|
+        FileUtils.mkdir_p(CONFIG.static_dir)
+        Dir.chdir(CONFIG.static_dir) do |dir|
           `wget -E -H -k -nH -p http://127.0.0.1:#{options[:port]}/`
           File.write('robots.txt', "User-agent: *\nDisallow: /\n")
         end
@@ -430,8 +430,10 @@ PageDown / Down / right / l / j | Goto next slide
     end
 
     def serve_static(port, options = {})
-      puts "Listening python server on http://0.0.0.0:#{port}" if options[:verbose]
-      `python3 -m http.server #{port}`
+      Dir.chdir(CONFIG.static_dir) do
+        puts "Listening python server on http://0.0.0.0:#{port}" if options[:verbose]
+        `python3 -m http.server #{port}`
+      end
     end
 
     def generate_pdf_file(options = {})
@@ -459,10 +461,6 @@ PageDown / Down / right / l / j | Goto next slide
       `ssh #{CONFIG.remote_host} "#{Array(cmds).join(';')}"`
     end
 
-    def self.static_dir
-      "public"
-    end
-
     def self.convert_to_filename(string)
       string.downcase.gsub(/[^a-z0-9.-]/, '')
     end

data/themes/modern/README.md

@@ -1,52 +1,12 @@
 # Modern theme
 
-Theme for [slide-em-up](https://github.com/nono/slide-em-up)
+Theme for [slideoff](https://github.com/DSIW/slideoff)
 
-This theme is based on [Bright Theme](https://github.com/shower/bright).
+## Installation
 
-# Installation
+1. Run `slideoff install_theme https://github.com/DSIW/slideoff-modern`
+1. Change `theme` element in your `presentation.json`
 
-0. `cd /tmp`
-1. `git clone url modern`
-2. `cd modern`
-2. `sass --update styles:css`
-2. `mkdir ~/.slide-em-up`
-3. `cp -r modern ~/.slide-em-up/modern`
-4. `mkdir ~/presentation`
-5. `cd ~/presentation`
-6. `mkdir main`
-7. `vim main/slides.md`
-```sh
-cat > main/slides.md <<EOF
-!SLIDE
-# My first slide
+## Usage
 
-* First bullet point
-EOF
-```
-8. Create presentation.json
-```sh
-cat > presentation.json <<EOF
-{
-  "title": "My first presentation",
-  "theme": "modern",
-  "pygments_style": "github",
-  "duration": 20,
-  "sections": {
-    "main": "Title of my main section"
-  }
-}
-EOF
-```
-9. `gem install slide-em-up`
-10. `slide-em-up`
-11. Open your browser on http://localhost:9000
-
-# Usage
-
-```html
-!SLIDE chapter
-!SLIDE section
-!SLIDE shout [up|right]
-!SLIDE cover [w|h|wh]
-```
+See this [README](https://github.com/DSIW/slideoff/blob/master/README.md).

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: slideoff
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: 0.3.1
 platform: ruby
 authors:
 - DSIW